[GNUnet-SVN] r15415 - gauger

[gnunet]

Author: bartpolot
Date: 2011-06-04 18:31:12 +0200 (Sat, 04 Jun 2011)
New Revision: 15415

Modified:
   gauger/install.sh
Log:
Fixed install script to work under "dash" shell


Modified: gauger/install.sh
===================================================================
--- gauger/install.sh   2011-06-04 13:00:16 UTC (rev 15414)
+++ gauger/install.sh   2011-06-04 16:31:12 UTC (rev 15415)
@@ -37,7 +37,8 @@
         2)
             echo "Default python version: 2"
             echo "Nothing to change..."
-           MSD2=${V#$MSD.}
+            MSD2=${V#$MSD.}
+            MSD2=${MSD2%%.*}
             ;;
         3)
             echo "Default python version: 3"
@@ -57,7 +58,8 @@
                 echo "and adapt scripts accordingly."
                 exit 1
             fi
-           MSD2=${V#$MSD.}
+            MSD2=${V##$MSD.}
+            MSD2=${MSD2%%.*}
             sed -e "s/#!\/usr\/bin\/env python$/#!\/usr\/bin\/env python2/" 
gauger > gauger.tmp
             mv gauger.tmp gauger
             echo "Done!!"
@@ -81,7 +83,7 @@
     fi
     cp "gauger" "$CLIENTPATH"
     echo "version $MSD.$MSD2"
-    if [[ "$MSD" = "2" && "$MSD2" < "8" ]]; then
+    if [ "$MSD" = "2" -a "$MSD2" -lt "7" ]; then
        cp "ap27.py" "$CLIENTPATH"
     fi
 
@@ -195,7 +197,7 @@
     echo "automatically to the configuration file the first time"
     echo "they log data to the gauger server [y/N]"
     read AUTOADD
-    if [[ "$AUTOADD" = "y" || "$AUTOADD" = "Y" ]]; then
+    if [ "$AUTOADD" = "y" -o "$AUTOADD" = "Y" ]; then
         AUTOADD="1"
     else
         AUTOADD="0"
@@ -228,7 +230,6 @@
     echo "Restarting Apache..."
     apachectl -k graceful
 
-    echo "Please edit $SERVERPATH/gauger.conf to set your data directory"
-    echo "of choice and add usernames and passwords for gauger users."
+    echo "To tweak your configuration, edit $SERVERPATH/gauger.conf"
 
 fi #Server part