Changeset 6657

Timestamp:

2004-01-29T14:31:30+13:00 (20 years ago)

Author:

jmt12

Message:

Temporarily disabled wget error messages as they aren't multilingual, and we have the UNESCO multilingual prototype release bearing down upon us.

File:

• trunk/gli/gli.sh (modified) (1 diff)

trunk/gli/gli.sh

@@ -123 +123 @@
 
 wok="NoWGet"
+
+# Commented out until after UNESCO release
 # 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
+#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
+#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'`
+#    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
+#    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 ----