Changeset 13027

Timestamp:

2006-10-06T09:47:25+13:00 (18 years ago)

Author:

mdewsnip

Message:

No longer uses the -wget option.

Location:

trunk/gli

Files:

• gli.bat (modified) (4 diffs)
• gli.sh (modified) (2 diffs)
• gli4gs3.bat (modified) (3 diffs)
• gli4gs3.sh (modified) (2 diffs)

trunk/gli/gli.bat

@@ -249 +249 @@
 echo.
 
-:: ---- Set wget path manually if don't want to use the version (1.9) 
-:: that comes with Greenstone -------
-set WGETPATH=
-
 if "%GLILANG%" == "en" echo Running the Greenstone Librarian Interface...
 if "%GLILANG%" == "es" echo Ejecutando la Interfaz de la Biblioteca Digital Greenstone...
@@ -268 +264 @@
 
 :webLib
-    "%JAVAPATH%\java" -Xmx128M -cp classes/;GLI.jar;lib/apache.jar;lib/qfslib.jar org.greenstone.gatherer.GathererProg -gsdl %GSDLHOME% -gsdlos %GSDLOS% -perl %PERLPATH% -wget %WGETPATH% %1 %2 %3 %4 %5 %6 %7 %8 %9
+    "%JAVAPATH%\java" -Xmx128M -cp classes/;GLI.jar;lib/apache.jar;lib/qfslib.jar org.greenstone.gatherer.GathererProg -gsdl %GSDLHOME% -gsdlos %GSDLOS% -perl %PERLPATH% %1 %2 %3 %4 %5 %6 %7 %8 %9
 
     if ERRORLEVEL 2 goto webLib
@@ -279 +275 @@
 
 :localLib
-    "%JAVAPATH%\java" -Xmx128M -cp classes/;GLI.jar;lib/apache.jar;lib/qfslib.jar org.greenstone.gatherer.GathererProg -gsdl %GSDLHOME% -gsdlos %GSDLOS% -perl %PERLPATH% -local_library %GSDLHOME%\server.exe -wget %WGETPATH% %1 %2 %3 %4 %5 %6 %7 %8 %9
+    "%JAVAPATH%\java" -Xmx128M -cp classes/;GLI.jar;lib/apache.jar;lib/qfslib.jar org.greenstone.gatherer.GathererProg -gsdl %GSDLHOME% -gsdlos %GSDLOS% -perl %PERLPATH% -local_library %GSDLHOME%\server.exe %1 %2 %3 %4 %5 %6 %7 %8 %9
 
     if ERRORLEVEL 2 goto localLib
@@ -297 +293 @@
 set PERLPATH=
 set JAVAPATH=
-set WGETPATH=

trunk/gli/gli.sh

@@ -218 +218 @@
     exit 1
 fi
-
-## ---- Set wgetpath manually if you don't want to use the default Greenstone version -----
-wgetpath=
 
 ## ---- Check that the GLI has been compiled ----
@@ -266 +263 @@
 
 
-  $javapath -Xmx128M -classpath classes/:GLI.jar:lib/apache.jar:lib/qfslib.jar org.greenstone.gatherer.GathererProg -gsdl $GSDLHOME -gsdlos $GSDLOS -wget $wgetpath $*
+  $javapath -Xmx128M -classpath classes/:GLI.jar:lib/apache.jar:lib/qfslib.jar org.greenstone.gatherer.GathererProg -gsdl $GSDLHOME -gsdlos $GSDLOS $*
   exit_status=$?
 

trunk/gli/gli4gs3.bat

@@ -299 +299 @@
 echo.
 
-:: ---- Set wget path manually if don't want to use the version (1.9) 
-:: that comes with Greenstone -------
-set WGETPATH=
-
 if "%GLILANG%" == "en" echo Running the Greenstone Librarian Interface...
 if "%GLILANG%" == "es" echo Ejecutando la Interfaz de la Biblioteca Digital Greenstone...
@@ -315 +311 @@
 :: -Xloggc:<file>   Write garbage collection log
 
-"%JAVAPATH%\java" -cp classes/;GLI.jar;lib/apache.jar;lib/qfslib.jar org.greenstone.gatherer.GathererProg -gsdl %GSDLHOME% -gsdlos %GSDLOS% -gsdl3 %GSDL3HOME% -gsdl3src %GSDL3SRCHOME% -perl %PERLPATH% -wget %WGETPATH% %1 %2 %3 %4 %5 %6 %7 %8 %9
+"%JAVAPATH%\java" -cp classes/;GLI.jar;lib/apache.jar;lib/qfslib.jar org.greenstone.gatherer.GathererProg -gsdl %GSDLHOME% -gsdlos %GSDLOS% -gsdl3 %GSDL3HOME% -gsdl3src %GSDL3SRCHOME% -perl %PERLPATH% %1 %2 %3 %4 %5 %6 %7 %8 %9
 
 if "%GLILANG%" == "en" echo Done!
@@ -331 +327 @@
 set PERLPATH=
 set JAVAPATH=
-set WGETPATH=

trunk/gli/gli4gs3.sh

@@ -272 +272 @@
     exit 1
 fi
-
-## ---- Set wgetpath manually if you don't want to use the default Greenstone version -----
-wgetpath=
 
 ## ---- Check that the GLI has been compiled ----
@@ -318 +315 @@
 # -Xloggc:<file>   Write garbage collection log
 
-    $javapath -Xmx128M -classpath classes/:GLI.jar:lib/apache.jar:lib/qfslib.jar org.greenstone.gatherer.GathererProg -gsdl $GSDLHOME -gsdlos $GSDLOS -gsdl3 $GSDL3HOME -gsdl3src $GSDL3SRCHOME -wget $wgetpath $*
+    $javapath -Xmx128M -classpath classes/:GLI.jar:lib/apache.jar:lib/qfslib.jar org.greenstone.gatherer.GathererProg -gsdl $GSDLHOME -gsdlos $GSDLOS -gsdl3 $GSDL3HOME -gsdl3src $GSDL3SRCHOME $*
     exit_status=$?