Changeset 24829 for main/trunk/gli/gli.bat

Timestamp:

2011-11-30T17:48:15+13:00 (12 years ago)

Author:

ak19

Message:

Changes to bat files and perl code to deal with brackets in (Windows) filepath. Also checked winmake.bat files to see if changes were needed there. These changes go together with the commits 24826 to 24828 for gems.bat, and commit 24820 on makegs2.bat.

File:

• main/trunk/gli/gli.bat (modified) (8 diffs)

main/trunk/gli/gli.bat

@@ -1 +1 @@
 @echo off
+setlocal enabledelayedexpansion
+
 color 0A
 set startdir=%CD%
@@ -48 +50 @@
     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
+    (echo This is a temporary file. It is safe to delete it. > "!GSDLHOME!\collect\testing.tmp" ) 2>nul
     if exist "%GSDLHOME%\collect\testing.tmp" goto deleteTempFile 
     if "%1" == "Elevated" goto printWarning
     echo ... FAILED
-    echo The %PROGNAME% cannot write to the collection directory (%GSDLHOME%\collect)
+    echo The %PROGNAME% cannot write to the collection directory (!GSDLHOME!\collect)
     echo Requesting elevated status to become admin user to continue.
     "%GSDLHOME%\bin\windows\gstart.exe" %0 Elevated %1 %2 %3 %4 %5 %6 %7 %8 %9
@@ -59 +61 @@
 :printWarning
     echo ... FAILED
-    echo The %PROGNAME% cannot write to the log directory (%GSDLHOME%\collect). 
+    echo The %PROGNAME% cannot write to the log directory (!GSDLHOME!\collect). 
     echo Attempting to continue without permissions.
     goto shiftElevated
@@ -114 +116 @@
 if not "%GSDL3SRCHOME%" == "" (
     echo GSDL3SRCHOME:
-    echo %GSDL3SRCHOME%
+    echo !GSDL3SRCHOME!
     echo.
 )
@@ -120 +122 @@
 if not "%GSDL3HOME%" == "" (
     echo GSDL3HOME:
-    echo %GSDL3HOME%
+    echo !GSDL3HOME!
     echo.
 )
@@ -126 +128 @@
 if not "%GSDLHOME%" == "" (
     echo GSDLHOME:
-    echo %GSDLHOME%
+    echo !GSDLHOME!
     echo.
 )
@@ -166 +168 @@
 :localLib
     if exist "%GSDLHOME%\server.exe" (
-    set locallib=%GSDLHOME%\server.exe
+    set locallib=!GSDLHOME!\server.exe
     ) else (
-    set locallib=%GSDLHOME%\gs2-web-server.bat
+    set locallib=!GSDLHOME!\gs2-web-server.bat
     )
 
@@ -211 +213 @@
 cd "%startdir%"
 set startdir=
+
+endlocal