Changeset 19171

Timestamp:

2009-04-21T16:28:51+12:00 (15 years ago)

Author:

oranfry

Message:

further space-proofing

File:

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

gli/trunk/gli.sh

@@ -277 +277 @@
 #JAVA_HOME=
 
-if [ -z $javapath ]; then
+if [ -z "$javapath" ]; then
 
     # sus out search4j
@@ -372 +372 @@
 
 ## -- Check the version of Java is new enough (1.4.0 or higher) to run the GLI --
-`$javapath -classpath . CheckJavaVersion > /dev/null`
+`"$javapath" -classpath . CheckJavaVersion > /dev/null`
 if [ $? -ne 2 ] ; then
     echo
@@ -421 +421 @@
 
 # basic_command is the cmd string common to both Greenstone 3 and Greenstone 2 execution
-basic_command="$javapath -Xmx128M -classpath classes/:GLI.jar:lib/apache.jar:lib/qfslib.jar org.greenstone.gatherer.GathererProg"
+#basic_command="$javapath -Xmx128M -classpath classes/:GLI.jar:lib/apache.jar:lib/qfslib.jar org.greenstone.gatherer.GathererProg"
 stop_gli=0
 while [ "$stop_gli" = "0" ] ; do 
@@ -437 +437 @@
 # GS2 webLib
     if [ "$PROGABBR" = "FLI" -o ! -f "$GSDLHOME/gs2-server.sh" ]; then
-        $basic_command -gsdl $GSDLHOME -gsdlos $GSDLOS $*
+        "$javapath" -Xmx128M -classpath classes/:GLI.jar:lib/apache.jar:lib/qfslib.jar org.greenstone.gatherer.GathererProg -gsdl "$GSDLHOME" -gsdlos $GSDLOS $*
         exit_status=$?
 # GS2 localLib
     else
-        $basic_command -gsdl $GSDLHOME -gsdlos $GSDLOS -local_library "$GSDLHOME/gs2-server.sh" $*
+        "$javapath" -Xmx128M -classpath classes/:GLI.jar:lib/apache.jar:lib/qfslib.jar org.greenstone.gatherer.GathererProg -gsdl "$GSDLHOME" -gsdlos $GSDLOS -local_library "$GSDLHOME/gs2-server.sh" $*
         exit_status=$?
     fi
 # GS3
     elif [ "$_version" -eq 3 ]; then    
-        $basic_command -gsdl $GSDLHOME -gsdlos $GSDLOS -gsdl3 $GSDL3HOME -gsdl3src $GSDL3SRCHOME $*
+        "$javapath" -Xmx128M -classpath classes/:GLI.jar:lib/apache.jar:lib/qfslib.jar org.greenstone.gatherer.GathererProg -gsdl "$GSDLHOME" -gsdlos $GSDLOS -gsdl3 "$GSDL3HOME" -gsdl3src "$GSDL3SRCHOME" $*
         exit_status=$?
     fi