Changeset 20905

Show
Ignore:
Timestamp:
04.11.2009 16:22:54 (10 years ago)
Author:
kjdon
Message:

Updated the file to deal with spaces in filepath, and with some corrections to bugs introduced on recent commit.

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • gsdl/trunk/gs2-server.bat

    r20901 r20905  
    4646:: the null (NUL) device does exist in every directory. As a result, you 
    4747:: can test for the null device to determine whether a directory exists." 
    48 ::echo %GSDLHOME%\apache-httpd\nul 
    49 if not exist %GSDLHOME%\apache-httpd\nul ( 
     48echo "%GSDLHOME%\apache-httpd\nul" 
     49if not exist "%GSDLHOME%\apache-httpd\*" ( 
    5050    echo. 
    5151    echo UNABLE TO CONTINUE: There is no apache-httpd directory. 
     
    7676 
    7777:: http://ss64.com/nt/call.html (and leave in trailing slash) 
    78 call :isinpath %GSDLHOME%\lib\java 
     78call :isinpath "%GSDLHOME%\lib\java" 
    7979 
    8080:: After the call, we come back here 
     
    103103:: http://ss64.com/nt/for_r.html and (for call) http://ss64.com/nt/for.html 
    104104:: http://ss64.com/nt/syntax-args.html 
    105 FOR /R "%GSDLHOME%\lib\java" %%G IN (*.jar) DO call :putinpath %%G 
     105FOR /R "%GSDLHOME%\lib\java" %%G IN (*.jar) DO call :putinpath "%%G" 
    106106echo   - Adjusted CLASSPATH 
    107107echo. 
     
    111111 
    112112:putinpath 
    113 echo jarfile: %1 
    114 set CLASSPATH=%CLASSPATH%;%1 
     113set jarfile=%1 
     114::strip quotes around jarfile path, since we can't update classpath with quotes 
     115set jarfile=%jarfile:"=% 
     116echo jarfile: %jarfile% 
     117set CLASSPATH=%CLASSPATH%;%jarfile% 
    115118goto :eof 
    116119 
     
    130133if "%serverlang%" == "en" ( 
    131134   echo *************************************************************** 
    132    echo Starting the Greenstone Server Interface (GSI)... 
     135   echo Starting the Greenstone Server Interface ^(GSI^)... 
    133136   echo. 
    134137   echo Server log messages go to: 
    135    echo    %GSDLHOME%\etc\logs-gsi\server.log 
     138   echo    "%GSDLHOME%\etc\logs-gsi\server.log" 
    136139   echo. 
    137140   echo Using Apache web server located at: 
    138    echo    %GSDLHOME%\apache-httpd\%GSDLOS%\bin\httpd 
     141   echo    "%GSDLHOME%\apache-httpd\%GSDLOS%\bin\httpd" 
    139142   echo The Apache error log is at: 
    140    echo    %GSDLHOME%\apache-httpd\%GSDLOS%\logs\error_log 
     143   echo    "%GSDLHOME%\apache-httpd\%GSDLOS%\logs\error_log" 
    141144   echo The Apache configuration file template is at: 
    142    echo    %GSDLHOME%\apache-httpd\%GSDLOS%\conf\httpd.conf.in 
     145   echo    "%GSDLHOME%\apache-httpd\%GSDLOS%\conf\httpd.conf.in" 
    143146   echo This is used to generate: 
    144    echo    %GSDLHOME%\apache-httpd\%GSDLOS%\conf\httpd.conf 
     147   echo    "%GSDLHOME%\apache-httpd\%GSDLOS%\conf\httpd.conf" 
    145148   echo    each time Enter Library is pressed or otherwise activated. 
    146149   echo ***************************************************************