Changeset 30592

Timestamp:

2016-06-24T15:50:39+12:00 (7 years ago)

Author:

ak19

Message:

Further changes to make sure recent updates to batch scripts still protect spaces in filepath

Location:

main/trunk

Files:

• gli/gems.bat (modified) (1 diff)
• gli/gli.bat (modified) (3 diffs)
• greenstone3/gs3-server.bat (modified) (1 diff)
• greenstone3/gs3-setup.bat (modified) (1 diff)

main/trunk/gli/gems.bat

@@ -48 +48 @@
 rem If GS3, get the using.user.web property from build.properties and if set to true, we can skip to shiftElevated
 :: http://ss64.com/nt/syntax-substring.html
-    if "%_VERSION%" == "3" if exist "%GSDL3SRCHOME%\build.properties" for /F "tokens=1,2 delims==" %%G in (%GSDL3SRCHOME%\build.properties) do ( 
+    if "%_VERSION%" == "3" if exist "%GSDL3SRCHOME%\build.properties" for /F "usebackq tokens=1,2 delims==" %%G in ("%GSDL3SRCHOME%\build.properties") do ( 
         if "%%G" == "using.user.web" if "%%H" == "true" goto :shiftElevated
     )

main/trunk/gli/gli.bat

@@ -52 +52 @@
 rem If GS3, get the using.user.web property from build.properties and if set to true, we can skip to shiftElevated
 :: http://ss64.com/nt/syntax-substring.html 
-    if "%_VERSION%" == "3" if exist "%GSDL3SRCHOME%\build.properties" for /F "tokens=1,2 delims==" %%G in (%GSDL3SRCHOME%\build.properties) do ( 
+    if "%_VERSION%" == "3" if exist "%GSDL3SRCHOME%\build.properties" for /F "usebackq tokens=1,2 delims==" %%G in ("%GSDL3SRCHOME%\build.properties") do ( 
         if "%%G" == "using.user.web" if "%%H" == "true" goto :shiftElevated
     )
@@ -168 +168 @@
     rem In a web-dispersed GS3 set up like in the labs, gsdl3home.isreadonly would be true and
     rem we need to run the web server in read-only mode. This section of code borrowed from gs3-server.bat. 
-    for /F "tokens=1,2 delims==" %%G in (%GSDL3SRCHOME%\build.properties) do ( 
+    for /F "usebackq tokens=1,2 delims==" %%G in ("%GSDL3SRCHOME%\build.properties") do ( 
         if "%%G"=="gsdl3home.isreadonly" if "%%H" == "true" (
             set gsdl3_writablehome=%TMP%\greenstone\web
@@ -174 +174 @@
             set opt_properties="-Dgsdl3home.isreadonly=true" -Dgsdl3.writablehome="%gsdl3_writablehome%"
             echo Setting Greenstone3 web home writable area to be: %gsdl3_writablehome%
-            pushd %GSDL3SRCHOME%
+            pushd "%GSDL3SRCHOME%"
             :: passing opt_properties is no longer necessary because ant.bat is unmodified (doesn't make use of it) 
             :: and because build.xml already contains the properties with the correct values

main/trunk/greenstone3/gs3-server.bat

@@ -17 +17 @@
 
 set USE_TMPDIR_FOR_TOMCAT=
-for /F "tokens=1,2 delims==" %%G in (%GSDL3SRCHOME%\build.properties) do ( 
+for /F "usebackq tokens=1,2 delims==" %%G in ("%GSDL3SRCHOME%\build.properties") do ( 
     if "%%G"=="gsdl3home.isreadonly" set USE_TMPDIR_FOR_TOMCAT=%%H
 )

main/trunk/greenstone3/gs3-setup.bat

@@ -40 +40 @@
 :: Replace forward slashes in web.home with back slashes 
 :: http://scripts.dragon-it.co.uk/scripts.nsf/docs/batch-search-replace-substitute!OpenDocument&ExpandSection=3&BaseTarget=East&AutoFramed
-if exist "!GSDL3SRCHOME!\build.properties" for /F "tokens=1,2 delims==" %%G in (!GSDL3SRCHOME!\build.properties) do ( 
+if exist "!GSDL3SRCHOME!\build.properties" for /F "usebackq tokens=1,2 delims==" %%G in ("!GSDL3SRCHOME!\build.properties") do ( 
     if "%%G"=="web.home" (
         set GSDL3HOME=%%H