Changeset 10331

Timestamp:

2005-07-27T16:41:10+12:00 (19 years ago)

Author:

kjdon

Message:

modified to use the new GSDL3HOME and GSDL3SRCHOEM variables

File:

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

trunk/gli/gli4gs3.sh

@@ -52 +52 @@
 if [ "$gsdl3path" == "" ]; then
     # Check the environment variable first
-    if [ "$GSDL3HOME" != "" ]; then
-    gsdl3path=$GSDL3HOME
+    if [ "$GSDL3SRCHOME" != "" ]; then
+    gsdl3path=$GSDL3SRCHOME
 
     # If it is not set, assume that the GLI is installed as a subdirectory of Greenstone 3
@@ -93 +93 @@
 
 # Setup Greenstone 3, unless it has already been done
-if [ "$GSDL3HOME" == "" ]; then
+if [ "$GSDL3HOME" == "" ] || [ "$GSDL3SRCHOME" == "" ]; then
     pushd $gsdl3path > /dev/null
     source gs3-setup.sh
@@ -112 +112 @@
     # If it is not set, assume that the gs2build subdirectory of Greenstone 3 exists
     else
-    gsdlpath=$GSDL3HOME/gs2build
+    gsdlpath=$GSDL3SRCHOME/gs2build
     fi
 fi
@@ -335 +335 @@
 # -Xloggc:<file>   Write garbage collection log
 
-$javapath -classpath classes/:GLI.jar:lib/apache.jar:lib/qfslib.jar:lib/mail.jar:lib/activation.jar org.greenstone.gatherer.GathererProg -gsdl $GSDLHOME -gsdl3 $GSDL3HOME -wget $wgetpath $*
+$javapath -classpath classes/:GLI.jar:lib/apache.jar:lib/qfslib.jar:lib/mail.jar:lib/activation.jar org.greenstone.gatherer.GathererProg -gsdl $GSDLHOME -gsdl3 $GSDL3HOME -gsdl3src $GSDL3SRCHOME -wget $wgetpath $*
 
 if [ "$glilang" == "es" ]; then