Changeset 22575

Timestamp:

2010-08-05T10:26:37+12:00 (14 years ago)

Author:

sjm84

Message:

Corrected a small error in gli.bat and tidied the script in both gli.bat and gems.bat

Location:

main/trunk/gli

Files:

• gems.bat (modified) ( previous)
• gli.bat (modified) (3 diffs)

main/trunk/gli/gli.bat

@@ -45 +45 @@
 
 :checkUserPermissions
+    echo.
     echo Checking if the Greenstone collection directory is writable ...
     (echo This is a temporary file. It is safe to delete it. > "%GSDLHOME%\collect\testing.tmp" ) 2>nul
@@ -156 +157 @@
 :: if FLI is running, we don't want the local Greenstone library server running
 if "%PROGABBR%" == "FLI" goto webLib
-    :: Else we're running GLI, so we want the local Greenstone library server (if server.exe/gs2-server.bat exists, otherwise it will be webLib)
-    if not exist "%GSDLHOME%\server.exe" if not exist "%GSDLHOME%\gs2-server.bat" goto webLib 
+    :: Else we're running GLI, so we want the local Greenstone library server (if server.exe/gs2-web-server.bat exists, otherwise it will be webLib)
+    if not exist "%GSDLHOME%\server.exe" if not exist "%GSDLHOME%\gs2-web-server.bat" goto webLib 
 
 :localLib
@@ -163 +164 @@
     set locallib=%GSDLHOME%\server.exe
     ) else (
-    set locallib=%GSDLHOME%\gs2-server.bat
+    set locallib=%GSDLHOME%\gs2-web-server.bat
     )