Changeset 30592

Show
Ignore:
Timestamp:
24.06.2016 15:50:39 (4 years ago)
Author:
ak19
Message:

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

Location:
main/trunk
Files:
4 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/gli/gems.bat

    r30573 r30592  
    4848rem If GS3, get the using.user.web property from build.properties and if set to true, we can skip to shiftElevated 
    4949:: http://ss64.com/nt/syntax-substring.html 
    50     if "%_VERSION%" == "3" if exist "%GSDL3SRCHOME%\build.properties" for /F "tokens=1,2 delims==" %%G in (%GSDL3SRCHOME%\build.properties) do (  
     50    if "%_VERSION%" == "3" if exist "%GSDL3SRCHOME%\build.properties" for /F "usebackq tokens=1,2 delims==" %%G in ("%GSDL3SRCHOME%\build.properties") do (  
    5151        if "%%G" == "using.user.web" if "%%H" == "true" goto :shiftElevated 
    5252    ) 
  • main/trunk/gli/gli.bat

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

    r30574 r30592  
    1717 
    1818set USE_TMPDIR_FOR_TOMCAT= 
    19 for /F "tokens=1,2 delims==" %%G in (%GSDL3SRCHOME%\build.properties) do (  
     19for /F "usebackq tokens=1,2 delims==" %%G in ("%GSDL3SRCHOME%\build.properties") do (  
    2020    if "%%G"=="gsdl3home.isreadonly" set USE_TMPDIR_FOR_TOMCAT=%%H 
    2121) 
  • main/trunk/greenstone3/gs3-setup.bat

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