Changeset 20905 for gsdl/trunk/gs2-server.bat

Timestamp:

2009-11-04T16:22:54+13:00 (14 years ago)

Author:

kjdon

Message:

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

File:

• gsdl/trunk/gs2-server.bat (modified) (5 diffs)

gsdl/trunk/gs2-server.bat

@@ -46 +46 @@
 :: the null (NUL) device does exist in every directory. As a result, you
 :: can test for the null device to determine whether a directory exists."
-::echo %GSDLHOME%\apache-httpd\nul
-if not exist %GSDLHOME%\apache-httpd\nul (
+echo "%GSDLHOME%\apache-httpd\nul"
+if not exist "%GSDLHOME%\apache-httpd\*" (
     echo.
     echo UNABLE TO CONTINUE: There is no apache-httpd directory.
@@ -76 +76 @@
 
 :: http://ss64.com/nt/call.html (and leave in trailing slash)
-call :isinpath %GSDLHOME%\lib\java
+call :isinpath "%GSDLHOME%\lib\java"
 
 :: After the call, we come back here
@@ -103 +103 @@
 :: http://ss64.com/nt/for_r.html and (for call) http://ss64.com/nt/for.html
 :: http://ss64.com/nt/syntax-args.html
-FOR /R "%GSDLHOME%\lib\java" %%G IN (*.jar) DO call :putinpath %%G
+FOR /R "%GSDLHOME%\lib\java" %%G IN (*.jar) DO call :putinpath "%%G"
 echo   - Adjusted CLASSPATH
 echo.
@@ -111 +111 @@
 
 :putinpath
-echo jarfile: %1
-set CLASSPATH=%CLASSPATH%;%1
+set jarfile=%1
+::strip quotes around jarfile path, since we can't update classpath with quotes
+set jarfile=%jarfile:"=%
+echo jarfile: %jarfile%
+set CLASSPATH=%CLASSPATH%;%jarfile%
 goto :eof
 
@@ -130 +133 @@
 if "%serverlang%" == "en" (
    echo ***************************************************************
-   echo Starting the Greenstone Server Interface (GSI)...
+   echo Starting the Greenstone Server Interface ^(GSI^)...
    echo.
    echo Server log messages go to:
-   echo    %GSDLHOME%\etc\logs-gsi\server.log
+   echo    "%GSDLHOME%\etc\logs-gsi\server.log"
    echo.
    echo Using Apache web server located at:
-   echo    %GSDLHOME%\apache-httpd\%GSDLOS%\bin\httpd
+   echo    "%GSDLHOME%\apache-httpd\%GSDLOS%\bin\httpd"
    echo The Apache error log is at:
-   echo    %GSDLHOME%\apache-httpd\%GSDLOS%\logs\error_log
+   echo    "%GSDLHOME%\apache-httpd\%GSDLOS%\logs\error_log"
    echo The Apache configuration file template is at:
-   echo    %GSDLHOME%\apache-httpd\%GSDLOS%\conf\httpd.conf.in
+   echo    "%GSDLHOME%\apache-httpd\%GSDLOS%\conf\httpd.conf.in"
    echo This is used to generate:
-   echo    %GSDLHOME%\apache-httpd\%GSDLOS%\conf\httpd.conf
+   echo    "%GSDLHOME%\apache-httpd\%GSDLOS%\conf\httpd.conf"
    echo    each time Enter Library is pressed or otherwise activated.
    echo ***************************************************************