Changeset 19158 for gsdl/trunk/gs2-server.sh

Timestamp:

2009-04-21T14:25:36+12:00 (15 years ago)

Author:

oranfry

Message:

space-proofed this script

File:

• gsdl/trunk/gs2-server.sh (modified) (4 diffs)

gsdl/trunk/gs2-server.sh

@@ -7 +7 @@
 
   # remove leading ./ if present
-  prog=${0#./}
+  prog="${0#./}"
 
-  isrelative=${prog%%/*}
+  isrelative="${prog%%/*}"
 
-  if [ ! -z $isrelative ] ; then
+  if [ ! -z "$isrelative" ] ; then
     # some text is left after stripping
     # => is relative
-    pwd=$PWD
-    prog="$pwd/$prog"
+    prog="$PWD/$prog"
   fi
 
-  fulldir=${prog%/*}
+  fulldir="${prog%/*}"
 
   # remove trailing /. if present
-  eval $1=${fulldir%/.}
+  eval "$1=\"${fulldir%/.}\""
 }
 
@@ -52 +51 @@
 # Setup Greenstone2, unless it has already been done
 if [ -z "$GSDLHOME" ]; then 
-  pushd $gsdl2path > /dev/null
+  pushd "$gsdl2path" > /dev/null
   source setup.bash
   popd > /dev/null
@@ -74 +73 @@
 if [ ! -e "$GSDLHOME/llssite.cfg" ]; then
     if [ -e "$GSDLHOME/llssite.cfg.in" ]; then
-    cp "$GSDLHOME/llssite.cfg.in" "$GSDLHOME/llssite.cfg"
+    cp "$GSDLHOME/llssite.cfg.in" "$GSDLHOME/llssite.cfg"
     else
-    echo "Warning: could not find llssite.cfg.in to create llssite.cfg from."
+    echo "Warning: could not find llssite.cfg.in to create llssite.cfg from."
     fi
-fi  
+fi
 
 # JRE_HOME or JAVA_HOME must be set correctly to run this program
@@ -85 +84 @@
     # In Java code, '...getResourceAsStream("build.properties")'
     # needs up to be in the right directory when run
-    pushd $gsdl2path > /dev/null
+    pushd "$gsdl2path" > /dev/null
 
 
     #CLASSPATH
     if [ `isinpath "$CLASSPATH" "$GSDLHOME/lib/java"` == "false" ]; then
-    CLASSPATH=$GSDLHOME/lib/java:$CLASSPATH
-    for JARFILE in $GSDLHOME/lib/java/*.jar; do
-        CLASSPATH=$CLASSPATH:$JARFILE
-    done
-    export CLASSPATH
+        CLASSPATH="$GSDLHOME/lib/java:$CLASSPATH"
+        for JARFILE in lib/java/*.jar; do
+            CLASSPATH="$CLASSPATH:$GSDLHOME/$JARFILE"
+        done
+        export CLASSPATH
+        echo "  - Adjusted CLASSPATH"
 
-    echo "  - Adjusted CLASSPATH"
     else
-    echo "  - CLASSPATH already correct"
+        echo "  - CLASSPATH already correct"
     fi
 
-    javapath=`search4j -m $java_min_version -e` 
-    $javapath org.greenstone.server.Server2 $GSDLHOME $serverlang $*
+    javapath="`search4j -m $java_min_version -e`"
+    "$javapath" org.greenstone.server.Server2 "$GSDLHOME" "$serverlang" $*
 
     popd > /dev/null