Show
Ignore:
Timestamp:
30.11.2011 17:48:15 (8 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.

Files:
1 modified

Legend:

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

    r23650 r24829  
    11@echo off 
     2setlocal enabledelayedexpansion 
     3 
    24color 0A 
    35set startdir=%CD% 
     
    4850    echo. 
    4951    echo Checking if the Greenstone collection directory is writable ... 
    50     (echo This is a temporary file. It is safe to delete it. > "%GSDLHOME%\collect\testing.tmp" ) 2>nul 
     52    (echo This is a temporary file. It is safe to delete it. > "!GSDLHOME!\collect\testing.tmp" ) 2>nul 
    5153    if exist "%GSDLHOME%\collect\testing.tmp" goto deleteTempFile  
    5254    if "%1" == "Elevated" goto printWarning 
    5355    echo ... FAILED 
    54     echo The %PROGNAME% cannot write to the collection directory (%GSDLHOME%\collect) 
     56    echo The %PROGNAME% cannot write to the collection directory (!GSDLHOME!\collect) 
    5557    echo Requesting elevated status to become admin user to continue. 
    5658    "%GSDLHOME%\bin\windows\gstart.exe" %0 Elevated %1 %2 %3 %4 %5 %6 %7 %8 %9 
     
    5961:printWarning 
    6062    echo ... FAILED 
    61     echo The %PROGNAME% cannot write to the log directory (%GSDLHOME%\collect).  
     63    echo The %PROGNAME% cannot write to the log directory (!GSDLHOME!\collect).  
    6264    echo Attempting to continue without permissions. 
    6365    goto shiftElevated 
     
    114116if not "%GSDL3SRCHOME%" == "" ( 
    115117    echo GSDL3SRCHOME: 
    116     echo %GSDL3SRCHOME% 
     118    echo !GSDL3SRCHOME! 
    117119    echo. 
    118120) 
     
    120122if not "%GSDL3HOME%" == "" ( 
    121123    echo GSDL3HOME: 
    122     echo %GSDL3HOME% 
     124    echo !GSDL3HOME! 
    123125    echo. 
    124126) 
     
    126128if not "%GSDLHOME%" == "" ( 
    127129    echo GSDLHOME: 
    128     echo %GSDLHOME% 
     130    echo !GSDLHOME! 
    129131    echo. 
    130132) 
     
    166168:localLib 
    167169    if exist "%GSDLHOME%\server.exe" ( 
    168     set locallib=%GSDLHOME%\server.exe 
     170    set locallib=!GSDLHOME!\server.exe 
    169171    ) else ( 
    170     set locallib=%GSDLHOME%\gs2-web-server.bat 
     172    set locallib=!GSDLHOME!\gs2-web-server.bat 
    171173    ) 
    172174 
     
    211213cd "%startdir%" 
    212214set startdir= 
     215 
     216endlocal