Changeset 30592 for main/trunk/greenstone3

Timestamp:

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

Author:

ak19

Message:

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

Location:

main/trunk/greenstone3

Files:

• gs3-server.bat (modified) (1 diff)
• gs3-setup.bat (modified) (1 diff)

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