Changeset 13675

Timestamp:

2007-01-18T13:25:12+13:00 (17 years ago)

Author:

shaoqun

Message:

made it pass GSDL3HOME to GEMS

File:

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

trunk/gli/gems4gs3.sh

@@ -44 +44 @@
 fi
 
-
-##  ---- Determine GSDLHOME ----
-gsdlpath=
-
+##  ---- Determine GSDL3SRCHOME ----
+gsdl3srcpath=
 # Some users may set the above line manually
-if [ "x$gsdlpath" = "x" ]; then
+if [ "x$gsdl3srcpath" = "x" ]; then
     # Check the environment variable first
-    if [ "x$GSDLHOME" != "x" ]; then
-    gsdlpath=$GSDLHOME
-
-    # If it is not set, assume that the GLI (and thus GEMS) is installed as a subdirectory of Greenstone
-    else
-    gsdlpath=`(cd .. && pwd)`
+    if [ "x$GSDL3SRCHOME" != "x" ]; then
+    gsdl3srcpath=$GSDL3SRCHOME
+
+    # If it is not set, assume that the GLI (and thus GEMS) is installed as a subdirectory of Greenstone3
+    else
+    gsdl3srcpath=`(cd .. && pwd)` 
     fi
 fi
@@ -62 +60 @@
 # Check that the Greenstone installation looks OK
 if [ "$glilang" = "es" ]; then
-    echo "Revisando GSDL: $gsdlpath"
-elif [ "$glilang" = "fr" ]; then
-    echo "Vérification de GSDL: $gsdlpath"
-elif [ "$glilang" = "ru" ]; then
-    echo "ðÒÏ×ÅÒËÁ GSDL: $gsdlpath"
-else
-    echo "Checking GSDL: $gsdlpath"
-fi
-if [ ! -f "${gsdlpath}/gs3-setup.sh" ] ; then
+    echo "Revisando GSDL3: $gsdl3srcpath"
+elif [ "$glilang" = "fr" ]; then
+    echo "Vérification de GSDL3: $gsdl3srcpath"
+elif [ "$glilang" = "ru" ]; then
+    echo "ðÒÏ×ÅÒËÁ GSDL3: $gsdl3srcpath"
+else
+    echo "Checking GSDL3: $gsdl3srcpath"
+fi
+if [ ! -f "${gsdl3srcpath}/gs3-setup.sh" ] ; then
     echo
     if [ "$glilang" = "es" ]; then
@@ -89 +87 @@
 fi
 
-# Setup Greenstone, unless it has already been done
-if [ "x$GSDLHOME" = "x" ]; then
-    cd "$gsdlpath"
+# Setup Greenstone3, unless it has already been done
+if [ "x$GSDL3SRCHOME" = "x" ]; then
+    cd "$gsdl3srcpath"
     . gs3-setup.sh
     cd "$thisdir"
@@ -215 +213 @@
 # -Xloggc:<file>   Write garbage collection log
 
-$javapath -classpath classes/:GLI.jar:lib/apache.jar org.greenstone.gatherer.gems.GEMS -gsdl $GSDLHOME $*
+
+$javapath -classpath classes/:GLI.jar:lib/apache.jar org.greenstone.gatherer.gems.GEMS -gsdl3 $GSDL3HOME $*
 
 if [ "$glilang" = "es" ]; then