Changeset 7676

Timestamp:

2004-06-30T16:19:35+12:00 (20 years ago)

Author:

kjdon

Message:

we no longer test wget in here. user can set wgetpath if they want, otherwise we will use Greenstone's wget, and do version testing (if any) in java

File:

• trunk/gli/gli.sh (modified) (2 diffs)

trunk/gli/gli.sh

@@ -231 +231 @@
 fi
 
-## ---- Check WGet exists ----
+## ---- Set wgetpath manually if you don't want to use the default Greenstone version -----
 wgetpath=
-
-wok="NoWGet"
-
-# Some users may set the above line manually
-if [ "$wgetpath" == "" ]; then
-    # Check if WGet is on the search path
-    wgetpath=`which wget 2> /dev/null`
-fi
-
-# Check that a WGet executable has been found
-echo "Checking WGet: $wgetpath"
-if [ ! -x "$wgetpath" ]; then
-    echo
-    echo "Failed to locate an appropriate version of WGet. Web mirroring will"
-    echo "be disabled. Greenstone Librarian Interface requires WGet installed"
-    echo "in order to fully access this feature."
-else
-    ## -- Check the version of WGet is new enough (1.9 or higher) to run properly --
-    wgetversion=`$wgetpath --version 2>&1 | sed -n 's/^GNU Wget \(.*\)/\1/p'`    
-    wvmajor=`echo $wgetversion | sed -n 's/^\([0-9]*\).*$/\1/p'`
-    wvminor=`echo $wgetversion | sed -n 's/^[0-9]*\.\(.*\)$/\1/p'`
-
-    wok="WGet1.9"
-    if [ $wvmajor -lt 1 ] ; then
-    wok="<WGet1.9"
-    fi
-    if [ $wvmajor -eq 1 ] && [ $wvminor -lt 9 ] ; then
-    wok="<WGet1.9"
-    fi
-    if [ $wok == "<WGet1.9" ] ; then
-    echo
-    echo "The version of the WGet you have installed has a known bug when"
-    echo "mirroring files which contain encoded characters such as space and"
-    echo "tilde in their URL. While this shouldn't be a problem, we recommend"
-        echo "installing WGet 1.9 or higher."
-    fi
-fi
 
 ## ---- Check that the GLI has been compiled ----
@@ -328 +291 @@
 # -Xloggc:<file>   Write garbage collection log
 
-$javapath -classpath classes/:GLI.jar:lib/apache.jar:lib/jp.jar:lib/polloxml.jar:lib/qfslib.jar:lib/mail.jar:lib/activation.jar org.greenstone.gatherer.Gatherer -gsdl $GSDLHOME -wget $wok$wgetpath $*
+$javapath -classpath classes/:GLI.jar:lib/apache.jar:lib/jp.jar:lib/polloxml.jar:lib/qfslib.jar:lib/mail.jar:lib/activation.jar org.greenstone.gatherer.Gatherer -gsdl $GSDLHOME -wget $wgetpath $*
 
 if [ "$glilang" == "es" ]; then