Changeset 8064

Timestamp:

2004-08-26T12:18:39+12:00 (20 years ago)

Author:

mdewsnip

Message:

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

File:

• trunk/gli/gli4gs3.bat (modified) (3 diffs)

trunk/gli/gli4gs3.bat

@@ -15 +15 @@
 
 :start
-if "%OS%" == "Windows_NT" goto findGSDL
+if "%OS%" == "Windows_NT" goto findGSDL3
     :: Invoke a new command processor to ensure there's enough environment space
-    if "%1" == "Second" goto findGSDL
+    if "%1" == "Second" goto findGSDL3
         command /E:2048 /C %0 Second %1 %2 %3 %4 %5 %6 %7 %8 %9
         goto done
 
-:findGSDL
+:findGSDL3
 echo.
 if "%GLILANG%" == "en" echo Greenstone Librarian Interface (GLI)
@@ -46 +46 @@
 
 echo.
-::  ---- Determine GSDLHOME ----
+::  ---- Determine GSDL3HOME ----
 set GSDL3PATH=
 
 :: Some users may set the above line manually
-if not "%GSDL3PATH%" == "" goto testGSDL
-
-    :: The default location for the GLI is a subdirectory of Greenstone
+if not "%GSDL3PATH%" == "" goto testGSDL3
+
+    :: The default location for the GLI is a subdirectory of Greenstone 3
     set GSDL3PATH=..
 
-    :: If it is set, use the GSDLHOME environment variable
-    if "%GSDL3HOME%" == "" goto testGSDL
+    :: If it is set, use the GSDL3HOME environment variable
+    if "%GSDL3HOME%" == "" goto testGSDL3
     set GSDL3PATH=%GSDL3HOME%
 
-:testGSDL
-:: Check that the Greenstone installation looks OK
+:testGSDL3
+:: Check that the Greenstone 3 installation looks OK
 if "%GLILANG%" == "en" echo Checking GSDL3: %GSDL3PATH%
 if "%GLILANG%" == "es" echo Revisando GSDL3: %GSDL3PATH%
 if "%GLILANG%" == "fr" echo V‚rification de GSDL3: %GSDL3PATH%
 if "%GLILANG%" == "ru" echo à®¢¥àª  GSDL3: %GSDL3PATH%
-if exist "%GSDL3PATH%\gs3-setup.bat" goto prepGSDL
+if exist "%GSDL3PATH%\gs3-setup.bat" goto prepGSDL3
+    echo.
+    if "%GLILANG%" == "en" echo The Greenstone 3 installation could not be found, or is incomplete.
+    if "%GLILANG%" == "en" echo Try reinstalling Greenstone 3 then running this script again.
+
+    if "%GLILANG%" == "es" echo No se pudo encontrar la instalaci¢n de Greenstone 3 o est  incompleta.
+    if "%GLILANG%" == "es" echo Trate de reinstalar Greenstone 3 y a continuaci¢n ejecute nuevamente este gui¢n.
+
+    if "%GLILANG%" == "fr" echo L'installation de Greenstone 3 est introuvable ou incomplŠte. Essayez
+    if "%GLILANG%" == "fr" echo de r‚installer Greenstone 3 et ex‚cutez ce script 
+ nouveau.
+
+    if "%GLILANG%" == "ru" echo ˆ­áâ ««ïæšï Greenstone 3 ­¥ ¡ë«  ­ ©€¥­  š«š ®­  ­¥¯®«­ . ®¯à®¡ã©â¥ ¯®¢â®à­®
+    if "%GLILANG%" == "ru" echo ãáâ ­®¢šâì Greenstone, 3   § ⥬ ¢¢¥áâš íâ®â áªàš¯â á­®¢ .
+    goto exit
+
+:prepGSDL3
+:: Setup Greenstone 3, unless it has already been done
+if not "%GSDL3HOME%" == "" goto doneGSDL3
+    cd | winutil\setvar.exe GLIDIR > setgli.bat
+    call setgli.bat
+    del setgli.bat
+    cd "%GSDL3PATH%"
+    call gs3-setup.bat SetEnv > nul
+    cd %GLIDIR%
+
+:doneGSDL3
+:: GSDL3PATH is no longer needed, since GSDL3HOME should now be set
+set GSDL3PATH=
+
+
+::  ---- Determine GSDLHOME ----
+set GSDLPATH=
+
+:: Some users may set the above line manually
+if not "%GSDLPATH%" == "" goto testGSDL
+
+    :: The default location for Greenstone is a gs2extra subdirectory of Greenstone 3
+    set GSDLPATH=%GSDL3HOME%\gs2extra
+
+    :: If it is set, use the GSDLHOME environment variable
+    if "%GSDLHOME%" == "" goto testGSDL
+    set GSDLPATH=%GSDLHOME%
+
+:testGSDL
+:: Check that the Greenstone installation looks OK
+if "%GLILANG%" == "en" echo Checking GSDL: %GSDLPATH%
+if "%GLILANG%" == "es" echo Revisando GSDL: %GSDLPATH%
+if "%GLILANG%" == "fr" echo V‚rification de GSDL: %GSDLPATH%
+if "%GLILANG%" == "ru" echo à®¢¥àª  GSDL: %GSDLPATH%
+if exist "%GSDLPATH%\setup.bat" goto prepGSDL
     echo.
     if "%GLILANG%" == "en" echo The Greenstone installation could not be found, or is incomplete.
@@ -83 +133 @@
 :prepGSDL
 :: Setup Greenstone, unless it has already been done
-if not "%GSDL3HOME%" == "" goto doneGSDL
-    call "%GSDL3PATH%\gs3-setup.bat" SetEnv > nul
+if not "%GSDLHOME%" == "" goto doneGSDL
+    call "%GSDLPATH%\setup.bat" SetEnv > nul
 
 :doneGSDL
-:: GSDL3PATH is no longer needed, since GSDL3HOME should now be set
-set GSDL3PATH=
+:: GSDLPATH is no longer needed, since GSDLHOME should now be set
+set GSDLPATH=