Ignore:
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:
1 edited

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone2/gs2-server.bat

    r22687 r24829  
    11@echo off
     2setlocal enabledelayedexpansion
     3
    24pushd "%CD%"
    35CD /D "%~dp0"
     
    810    echo Checking if the Greenstone log directory is writable ...
    911    if not exist "%GSDLHOME%\etc\logs-gsi" goto missingLogDir
    10     (echo This is a temporary file. It is safe to delete it. > "%GSDLHOME%\etc\logs-gsi\testing.tmp" ) 2>nul
     12    (echo This is a temporary file. It is safe to delete it. > "!GSDLHOME!\etc\logs-gsi\testing.tmp" ) 2>nul
    1113    if exist "%GSDLHOME%\etc\logs-gsi\testing.tmp" goto deleteTempFile
    1214    if "%1" == "Elevated" goto printWarning
    1315    echo ... FAILED
    14     echo The Greenstone server cannot write to the log directory (%GSDLHOME%\etc\logs-gsi)
     16    echo The Greenstone server cannot write to the log directory (!GSDLHOME!\etc\logs-gsi)
    1517    echo Requesting elevated status to become admin user to continue.
    1618    "%GSDLHOME%\bin\windows\gstart.exe" %0 Elevated %1 %2 %3 %4 %5 %6 %7 %8 %9
     
    1921:missingLogDir
    2022    echo ... FAILED
    21     echo The Greenstone log directory does not exist (%GSDLHOME%\etc\logs-gsi). Please either create this directory or reinstall Greenstone.
     23    echo The Greenstone log directory does not exist (!GSDLHOME!\etc\logs-gsi). Please either create this directory or reinstall Greenstone.
    2224    pause
    2325    goto done
     
    2527:printWarning
    2628    echo ... FAILED
    27     echo The Greenstone server cannot write to the log directory (%GSDLHOME%\etc\logs-gsi).
     29    echo The Greenstone server cannot write to the log directory (!GSDLHOME!\etc\logs-gsi).
    2830    echo Attempting to continue without permissions.
    2931    goto shiftElevated
     
    5254:done
    5355popd
     56endlocal
Note: See TracChangeset for help on using the changeset viewer.