Changeset 24829 for main/trunk/greenstone2/gs2-web-server.bat

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:

• main/trunk/greenstone2/gs2-web-server.bat (modified) (9 diffs)

main/trunk/greenstone2/gs2-web-server.bat

@@ -1 +1 @@
 @echo off
-SETLOCAL
+SETLOCAL enabledelayedexpansion
 
 if "%serverlang%" == "" set serverlang=en
@@ -21 +21 @@
 :: Some users may set the above line manually
 if "%gsdl2path%" == "" (
-   set GSDLHOME=%CD%
-   set gsdl2path=%CD%
+   set GSDLHOME=!CD!
+   set gsdl2path=!CD!
 )
 
@@ -29 +29 @@
     echo Checking if the Greenstone log directory is writable ...
     if not exist "%GSDLHOME%\etc\logs-gsi" goto missingLogDir
-    (echo This is a temporary file. It is safe to delete it. > "%GSDLHOME%\etc\logs-gsi\testing.tmp" ) 2>nul
+    (echo This is a temporary file. It is safe to delete it. > "!GSDLHOME!\etc\logs-gsi\testing.tmp" ) 2>nul
     if exist "%GSDLHOME%\etc\logs-gsi\testing.tmp" goto deleteTempFile  
     if "%1" == "Elevated" goto printWarning
     echo ... FAILED
-    echo The Greenstone server cannot write to the log directory (%GSDLHOME%\etc\logs-gsi)
+    echo The Greenstone server cannot write to the log directory (!GSDLHOME!\etc\logs-gsi)
     echo Requesting elevated status to become admin user to continue.
     "%GSDLHOME%\bin\windows\gstart.exe" %0 Elevated %1 %2 %3 %4 %5 %6 %7 %8 %9
@@ -40 +40 @@
 :missingLogDir
     echo ... FAILED
-    echo The Greenstone log directory does not exist (%GSDLHOME%\etc\logs-gsi). Please reinstall Greenstone.
+    echo The Greenstone log directory does not exist (!GSDLHOME!\etc\logs-gsi). Please reinstall Greenstone.
     pause
     goto exit
@@ -46 +46 @@
 :printWarning
     echo ... FAILED
-    echo The Greenstone server cannot write to the log directory (%GSDLHOME%\etc\logs-gsi). 
+    echo The Greenstone server cannot write to the log directory (!GSDLHOME!\etc\logs-gsi). 
     echo Attempting to continue without permissions.
     goto shiftElevated
@@ -64 +64 @@
 :: If either GSDLHOME or GSDLOS is not set, need to run setup.bat first
 :: OR operations in an IF stmt: http://fixunix.com/ms-dos/21057-how-implement-if-condition-batch-file.html
-for %%i in ("%GSDLOS%" "%GSDLHOME%") do if %%i == "" set OR=True
+for %%i in ("!GSDLOS!" "!GSDLHOME!") do if %%i == "" set OR=True
 if "%OR%" == "True" (
-   pushd "%gsdl2path%"
+   pushd "!gsdl2path!"
    call setup.bat
 rem   echo **** GSDLOS: %GSDLOS% and GSDLHOME: %GSDLHOME%
@@ -97 +97 @@
 if exist "%GSDLHOME%\llssite.cfg" goto cfgfile
 if exist "%GSDLHOME%\llssite.cfg.in" (
-   copy "%GSDLHOME%\llssite.cfg.in" "%GSDLHOME%\llssite.cfg"
+   copy "!GSDLHOME!\llssite.cfg.in" "!GSDLHOME!\llssite.cfg"
 ) else (
    echo Warning: could not find llssite.cfg.in to create llssite.cfg from.
@@ -129 +129 @@
 if not "%CLASSPATH%" == "" if not "%CLASSPATH%" == "%test_cpath%" (
    echo   - CLASSPATH already correct:
-   echo %CLASSPATH%
+   echo !CLASSPATH!
    goto :eof
 )
@@ -173 +173 @@
    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 ***************************************************************