Changeset 19171

Show
Ignore:
Timestamp:
21.04.2009 16:28:51 (10 years ago)
Author:
oranfry
Message:

further space-proofing

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • gli/trunk/gli.sh

    r19155 r19171  
    277277#JAVA_HOME= 
    278278 
    279 if [ -z $javapath ]; then 
     279if [ -z "$javapath" ]; then 
    280280 
    281281    # sus out search4j 
     
    372372 
    373373## -- Check the version of Java is new enough (1.4.0 or higher) to run the GLI -- 
    374 `$javapath -classpath . CheckJavaVersion > /dev/null` 
     374`"$javapath" -classpath . CheckJavaVersion > /dev/null` 
    375375if [ $? -ne 2 ] ; then 
    376376    echo 
     
    421421 
    422422# basic_command is the cmd string common to both Greenstone 3 and Greenstone 2 execution 
    423 basic_command="$javapath -Xmx128M -classpath classes/:GLI.jar:lib/apache.jar:lib/qfslib.jar org.greenstone.gatherer.GathererProg" 
     423#basic_command="$javapath -Xmx128M -classpath classes/:GLI.jar:lib/apache.jar:lib/qfslib.jar org.greenstone.gatherer.GathererProg" 
    424424stop_gli=0 
    425425while [ "$stop_gli" = "0" ] ; do  
     
    437437# GS2 webLib 
    438438    if [ "$PROGABBR" = "FLI" -o ! -f "$GSDLHOME/gs2-server.sh" ]; then 
    439         $basic_command -gsdl $GSDLHOME -gsdlos $GSDLOS $* 
     439        "$javapath" -Xmx128M -classpath classes/:GLI.jar:lib/apache.jar:lib/qfslib.jar org.greenstone.gatherer.GathererProg -gsdl "$GSDLHOME" -gsdlos $GSDLOS $* 
    440440        exit_status=$? 
    441441# GS2 localLib 
    442442    else 
    443         $basic_command -gsdl $GSDLHOME -gsdlos $GSDLOS -local_library "$GSDLHOME/gs2-server.sh" $* 
     443        "$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" $* 
    444444        exit_status=$? 
    445445    fi 
    446446# GS3 
    447447    elif [ "$_version" -eq 3 ]; then     
    448         $basic_command -gsdl $GSDLHOME -gsdlos $GSDLOS -gsdl3 $GSDL3HOME -gsdl3src $GSDL3SRCHOME $* 
     448        "$javapath" -Xmx128M -classpath classes/:GLI.jar:lib/apache.jar:lib/qfslib.jar org.greenstone.gatherer.GathererProg -gsdl "$GSDLHOME" -gsdlos $GSDLOS -gsdl3 "$GSDL3HOME" -gsdl3src "$GSDL3SRCHOME" $* 
    449449        exit_status=$? 
    450450    fi