Changeset 19403 for gli/trunk/client-gli.sh

Timestamp:

2009-05-12T13:25:00+12:00 (15 years ago)

Author:

ak19

Message:

3 changes. 1. Moved gli.sh's logic for finding and setting GSDLHOME (and GSDL3SRCHOME and GSDL3HOME) into a separate bashfile: findgsdl.sh. 2. This script is now called by both gli.sh and client-gli.sh, since client-gli can from now on use the same logic to locate a local GS installation. The only difference is that if GSDLHOME is not found, then client-gli runs as before: no Download panel. 3. client-gli.sh will no longer be looking for a gs2build directory located inside a client-gli checkout, but instead search for a local GSDLHOME (including in the directory directly above, in case client-gli.sh is run from a normal GS checkout. IF a GSDLHOME is found (and perl too), then client-gli will enable the Download panel, and use the local GSDLHOME to do any downloading.

File:

• gli/trunk/client-gli.sh (modified) (3 diffs)

gli/trunk/client-gli.sh

@@ -24 +24 @@
     PROGNAME_EN="Greenstone Librarian Interface"
 fi
+
+# we're running GLI (or FLI) in client mode
+GLIMODE="client"
 
 
@@ -57 +60 @@
 thisdir="`cd \"$thisdir\" && pwd`"
 cd "$thisdir"
+
+##  ---- Determine GSDLHOME to see if the download panel can be enabled ----
+# Need to source a script in order to inherit the env vars it has set.
+# Try to detect a local GSDLHOME installation (need gs2build). If none can
+# be found, then client-gli won't have a download panel. We're calling 
+# findgsdl.bat purely for knowing if there's a GSDLHOME around and to set and
+# use that for downloading. If there IS a local GSDLHOME, then we can download
+# (and build) locally, but ONLY if we have perl. Else downloading and building
+# will have to be done remotely anyway. If Perl is found, PERLPATH will be set.
+source ./findgsdl.sh
+local_gs="false"
+if [ "x$GSDLHOME" != "x" ] ; then
+    # GSDLHOME set, test for perl
+    # no need to source the findperl script since it does not set env vars
+    exit_status=0
+    ./findperl.sh
+    exit_status=$?
+    if [ "$exit_status" -ne 1 ]; then
+    local_gs="true"
+    fi 
+fi
+
 
 ## ---- findJava ----
@@ -108 +133 @@
 
 # GS2 only requires -classpath classes/:GLI.jar:lib/apache.jar:lib/qfslib.jar. GS3 requires more but it doesn't conflict with GS2:
-if [ ! -d "${thisdir}/gs2build" ]; then
+if [ "$local_gs" = "false" ]; then
+    echo "Since there's no GSDLHOME, client-GLI's download panel will be deactivated."
+    echo
     $javapath -Xmx128M -classpath classes/:GLI.jar:lib/apache.jar:lib/qfslib.jar:lib/commons-codec-1.3.jar:lib/commons-httpclient-3.1-rc1.jar:lib/commons-logging-1.1.jar org.greenstone.gatherer.GathererProg -use_remote_greenstone $*
 else
     gsdlos=`uname -s | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-# check for running bash under cygwin
+    # check for running bash under cygwin
     if test "`echo $gsdlos | sed 's/cygwin//'`" != "$gsdlos" ; then
     gsdlos=windows
     fi
-    $javapath -Xmx128M -classpath classes/:GLI.jar:lib/apache.jar:lib/qfslib.jar:lib/commons-codec-1.3.jar:lib/commons-httpclient-3.1-rc1.jar:lib/commons-logging-1.1.jar org.greenstone.gatherer.GathererProg -use_remote_greenstone -gsdl "${thisdir}/gs2build" -gsdlos $gsdlos $*
+    echo "Perl and GSDLHOME ($GSDLHOME) detected."
+    echo "Downloading is enabled."
+    echo
+    $javapath -Xmx128M -classpath classes/:GLI.jar:lib/apache.jar:lib/qfslib.jar:lib/commons-codec-1.3.jar:lib/commons-httpclient-3.1-rc1.jar:lib/commons-logging-1.1.jar org.greenstone.gatherer.GathererProg -use_remote_greenstone -gsdl "$GSDLHOME" -gsdlos $gsdlos $*
 fi