[SM-Commit] GIT changes to master grimoire by Andraž Levstik (e1c99ad323a8017e26eaf0cc6c8f4de19134e0c8)

Andraž Levstik scm at sourcemage.org
Sun Feb 8 01:53:36 EST 2009


GIT changes to master grimoire by Andraž Levstik <ruskie at codemages.net>:

 smgl/smgl-gl_select/DETAILS        |    2 +-
 smgl/smgl-gl_select/HISTORY        |    5 +++--
 smgl/smgl-gl_select/smgl-gl_select |   30 +++++++++++++++++++-----------
 3 files changed, 23 insertions(+), 14 deletions(-)

New commits:
commit ef0930c838d81936817ad124fc5f6490076edfcf
Author: Andraž Levstik <ruskie at codemages.net>
Commit: Andraž Levstik <ruskie at codemages.net>

    smgl-gl_select: 1.0.1, made it quiet

diff --git a/smgl/smgl-gl_select/DETAILS b/smgl/smgl-gl_select/DETAILS
index 6a452fb..96c1034 100755
--- a/smgl/smgl-gl_select/DETAILS
+++ b/smgl/smgl-gl_select/DETAILS
@@ -1,5 +1,5 @@
            SPELL=smgl-gl_select
-         VERSION=1.0.0
+         VERSION=1.0.1
         WEB_SITE=http://www.sourcemage.org
          ENTERED=20061014
       LICENSE[0]=GPL
diff --git a/smgl/smgl-gl_select/HISTORY b/smgl/smgl-gl_select/HISTORY
index 6e28ca0..201cb87 100644
--- a/smgl/smgl-gl_select/HISTORY
+++ b/smgl/smgl-gl_select/HISTORY
@@ -3,9 +3,10 @@
 	* gl_select: config file
 	* mesa-filelist: mesa filelist
 	* nvidia-filelist: nvidia filelist
-	* DETAILS: updated to 1.0.0
+	* DETAILS: updated to 1.0.0, update to 1.0.1
 	* INSTALL: added filelists
-	* smgl-gl_select: updated to 1.0.0
+	* smgl-gl_select: updated to 1.0.0, update to 1.0.1,
+	  made it really quiet
 
 2007-03-03 Jeremy Blosser <jblosser-smgl at firinn.org>
 	* smgl-gl_select: Replace bad TRACK_ROOT usage (automated).
diff --git a/smgl/smgl-gl_select/smgl-gl_select b/smgl/smgl-gl_select/smgl-gl_select
index 9a81c66..7493d90 100755
--- a/smgl/smgl-gl_select/smgl-gl_select
+++ b/smgl/smgl-gl_select/smgl-gl_select
@@ -6,7 +6,7 @@
 # Minor - new GL provider added/removed
 # Point - bugfixes/filelist changes and so on
 #
-GL_SELECT_VERSION="1.0.0"
+GL_SELECT_VERSION="1.0.1"
 GL_LIBS="$(ls ${TRACK_ROOT}/usr/lib/*/libGL.so | awk -F"/" '{print $4}' 2> /dev/null )"
 GL_FILELIST_DIR="${TRACK_ROOT}/usr/share/gl_select/"
 . /etc/sysconfig/gl_select
@@ -43,7 +43,7 @@ function gl_pick() {
     rm -f $ii
     echo -n "."
   done
-  echo "."
+  echo -n "."
   unset i ii
   for i in $(grep "/mesa" $GL_FILELIST_DIR/mesa-filelist)
   do
@@ -51,7 +51,7 @@ function gl_pick() {
     rm -f $ii
     echo -n "."
   done
-  echo "."
+  echo -n "."
   unset i ii
   for i in $(grep "/nvidia" $GL_FILELIST_DIR/nvidia-filelist)
   do
@@ -62,18 +62,19 @@ function gl_pick() {
   unset i ii
   echo ""
   message "Done."
+  message "Setting up new GL provider $gl_lib..."
     case "$1" in
        ati)
             for i in $(grep "/mesa" $GL_FILELIST_DIR/ati-filelist)
             do
               ii=${i/\/mesa}
-              ln -svf ${INSTALL_ROOT}${i} ${INSTALL_ROOT}${ii}
+              ln -sf ${INSTALL_ROOT}${i} ${INSTALL_ROOT}${ii} 2>/dev/null
               echo -n "."
             done
             for i in $(grep "/ati" $GL_FILELIST_DIR/ati-filelist)
             do
               ii=${i/\/ati}
-              ln -svf ${INSTALL_ROOT}${i} ${INSTALL_ROOT}${ii}
+              ln -sf ${INSTALL_ROOT}${i} ${INSTALL_ROOT}${ii} 2>/dev/null
               echo -n "."
             done
             ;;
@@ -81,7 +82,7 @@ function gl_pick() {
             for i in $(cat $GL_FILELIST_DIR/mesa-filelist)
             do
               ii=${i/\/mesa}
-              ln -svf ${INSTALL_ROOT}${i} ${INSTALL_ROOT}${ii}
+              ln -sf ${INSTALL_ROOT}${i} ${INSTALL_ROOT}${ii} 2>/dev/null
               echo -n "."
             done
             ;;
@@ -89,21 +90,28 @@ function gl_pick() {
             for i in $(grep "/mesa" $GL_FILELIST_DIR/nvidia-filelist)
             do
               ii=${i/\/mesa}
-              ln -svf ${INSTALL_ROOT}${i} ${INSTALL_ROOT}${ii}
+              ln -sf ${INSTALL_ROOT}${i} ${INSTALL_ROOT}${ii} 2>/dev/null
               echo -n "."
             done
             for i in $(grep "/nvidia" $GL_FILELIST_DIR/nvidia-filelist)
             do
               ii=${i/\/nvidia}
-              ln -svf ${INSTALL_ROOT}${i} ${INSTALL_ROOT}${ii}
+              ln -sf ${INSTALL_ROOT}${i} ${INSTALL_ROOT}${ii} 2>/dev/null
               echo -n "."
             done
             ;;
          *) message "Unknown secondary files so I only linked the libGL.so"  &&
-            rm -fv  ${TRACK_ROOT}/usr/lib/libGL.so*                          &&
-            ln -vfs ${TRACK_ROOT}/usr/lib/$gl_lib/libGL.so*                  \
-                    ${INSTALL_ROOT}/usr/lib/                                 ;;
+            for i in $(cat $GL_FILELIST_DIR/mesa-filelist)
+            do
+              ii=${i/\/mesa}
+              ln -sf ${INSTALL_ROOT}${i} ${INSTALL_ROOT}${ii} 2>/dev/null
+              echo -n "."
+            done
+            ln -fs ${TRACK_ROOT}/usr/lib/$gl_lib/libGL.so*                  \
+                    ${INSTALL_ROOT}/usr/lib/ 2>/dev/null
+            ;;
     esac
+    echo -e "\nDone."
     exit 0
   else
     message "Error ${INSTALL_ROOT}/usr/lib/libGL.so is not a symlink unable to procede!!!"



More information about the SM-Commit mailing list