Changeset 8065

Timestamp:

2004-08-26T12:19:13+12:00 (20 years ago)

Author:

mdewsnip

Message:

Now sets GSDLHOME itself (rather than relying on gs3-setup.* to do it).

File:

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

trunk/gli/gli4gs3.sh

@@ -45 +45 @@
 
 
-##  ---- Determine GSDLHOME ----
+##  ---- Determine GSDL3HOME ----
 gsdl3path=
 
@@ -54 +54 @@
     gsdl3path=$GSDL3HOME
 
-    # If it is not set, assume that the GLI is installed as a subdirectory of Greenstone
+    # If it is not set, assume that the GLI is installed as a subdirectory of Greenstone 3
     else
     pushd .. > /dev/null
@@ -62 +62 @@
 fi
 
+# Check that the Greenstone 3 installation looks OK
+if [ "$glilang" == "es" ]; then
+    echo "Revisando GSDL3: $gsdl3path"
+elif [ "$glilang" == "fr" ]; then
+    echo "Vérification de GSDL3: $gsdl3path"
+elif [ "$glilang" == "ru" ]; then
+    echo "ðÒÏ×ÅÒËÁ GSDL3: $gsdl3path"
+else
+    echo "Checking GSDL3: $gsdl3path"
+fi
+if [ ! -f "${gsdl3path}/gs3-setup.sh" ] ; then
+    echo
+    if [ "$glilang" == "es" ]; then
+    echo "No se pudo encontrar la instalación de Greenstone 3 o está incompleta."
+        echo "Trate de reinstalar Greenstone 3 y a continuación ejecute nuevamente"
+    echo "este guión."
+    elif [ "$glilang" == "fr" ]; then
+    echo "L'installation de Greenstone 3 est introuvable ou incomplète."
+    echo "Essayez de réinstaller Greenstone 3 et exécutez ce script à nouveau."
+    elif [ "$glilang" == "ru" ]; then
+    echo "éÎÓÔÁÌÌÑÃÉÑ Greenstone 3 ÎÅ ÂÙÌÁ ÎÁÊÄÅÎÁ ÉÌÉ ÏÎÁ ÎÅÐÏÌÎÁ."
+    echo "ðÏÐÒÏÂÕÊÔÅ ÐÏ×ÔÏÒÎÏ ÕÓÔÁÎÏ×ÉÔØ Greenstone 3, Á ÚÁÔÅÍ ××ÅÓÔÉ ÜÔÏÔ ÓËÒÉÐÔ ÓÎÏ×Á."
+    else
+    echo "The Greenstone 3 installation could not be found, or is incomplete."
+    echo "Try reinstalling Greenstone 3 then running this script again."
+    fi
+    exit 1
+fi
+
+# Setup Greenstone 3, unless it has already been done
+if [ "$GSDL3HOME" == "" ]; then
+    pushd $gsdl3path > /dev/null
+    source gs3-setup.sh
+    popd > /dev/null
+fi
+
+
+##  ---- Determine GSDLHOME ----
+gsdlpath=
+
+# Some users may set the above line manually
+if [ "$gsdlpath" == "" ]; then
+    # Check the environment variable first
+    if [ "$GSDLHOME" != "" ]; then
+    gsdlpath=$GSDLHOME
+
+    # If it is not set, assume that the gs2extra subdirectory of Greenstone 3 exists
+    else
+    gsdlpath=$GSDL3HOME/gs2extra
+    fi
+fi
+
 # Check that the Greenstone installation looks OK
 if [ "$glilang" == "es" ]; then
-    echo "Revisando GSDL3: $gsdl3path"
-elif [ "$glilang" == "fr" ]; then
-    echo "Vérification de GSDL3: $gsdl3path"
-elif [ "$glilang" == "ru" ]; then
-    echo "ðÒÏ×ÅÒËÁ GSDL3: $gsdl3path"
-else
-    echo "Checking GSDL3: $gsdl3path"
-fi
-if [ ! -f "${gsdl3path}/gs3-setup.sh" ] ; 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}/setup.bash" ] ; then
     echo
     if [ "$glilang" == "es" ]; then
@@ -92 +144 @@
 
 # Setup Greenstone, unless it has already been done
-if [ "$GSDL3HOME" == "" ]; then
-    pushd $gsdl3path > /dev/null
-    source gs3-setup.sh
+if [ "$GSDLHOME" == "" ]; then
+    pushd $gsdlpath > /dev/null
+    source setup.bash
     popd > /dev/null
 fi
@@ -291 +343 @@
 # -Xloggc:<file>   Write garbage collection log
 
+echo Using GSDLHOME: $GSDLHOME
+
 $javapath -classpath classes/:GLI.jar:lib/apache.jar:lib/jp.jar:lib/qfslib.jar:lib/mail.jar:lib/activation.jar org.greenstone.gatherer.GathererProg -gsdl $GSDLHOME -gsdl3 $GSDL3HOME -wget $wgetpath $*