Changeset 19155

Timestamp:

2009-04-21T13:49:49+12:00 (15 years ago)

Author:

oranfry

Message:

space-proofing this script

File:

• gli/trunk/gli.sh (modified) (5 diffs)

gli/trunk/gli.sh

@@ -129 +129 @@
 _version=
 if [ "x$gsdlpath" != "x" ]; then
-    get_version $gsdlpath
+    get_version "$gsdlpath"
     _version=$?
 # otherwise $gsdlpath is not yet set
@@ -158 +158 @@
     # Still need to find what version we are running:
     # GS3 main directory contains file gs3-setup.sh, GS2 only setup.bash
-    get_version $gsdlpath
+    get_version "$gsdlpath"
     _version=$?
     fi
@@ -166 +166 @@
 
 # Check that the main Greenstone installation for the version we're running looks OK
-check_installation $gsdlpath $_version $glilang
+check_installation "$gsdlpath" "$_version" "$glilang"
 
 
@@ -206 +206 @@
     fi
     # Check that Greenstone 3's Greenstone 2 stuff looks OK (in gs2build)
-    check_installation $gsdl2path "" $glilang
+    check_installation "$gsdl2path" "" "$glilang"
   
     # Setup Greenstone 3's gs2build, unless it has already been done
@@ -308 +308 @@
     fi  
     
-    javapath=`$SEARCH4J_EXECUTABLE -e -p $HINT -m $MINIMUM_JAVA_VERSION`
+    javapath="`"$SEARCH4J_EXECUTABLE" -e -p "$HINT" -m $MINIMUM_JAVA_VERSION`"
 
     if [ "$?" != "0" ]; then
 
-        OLDVER=`"$SEARCH4J_EXECUTABLE" -v -p "$HINT"`
+        OLDVER="`"$SEARCH4J_EXECUTABLE" -v -p "$HINT"`"
 
         if [ "$?" = "0" ]; then