Changeset 20906 for gsdl

Timestamp:

2009-11-04T18:28:06+13:00 (14 years ago)

Author:

kjdon

Message:

First commit of fixes to make gsicontrol work with spaces in the GSDLHOME filepath (and in that of configfile). However, it still doesn't work when gsdlsite.cfg is missing and there are spaces in GSDLHOME. That still needs to be fixed.

File:

• gsdl/trunk/gsicontrol.bat (modified) (3 diffs)

gsdl/trunk/gsicontrol.bat

@@ -5 +5 @@
 set target=%1
 set configfile=%2
+:: remove any quotes around configfile, if we were given parameter configfile
+:: To test for the existence of a cmdline parameter: http://ss64.com/nt/if.html
+if not [%2] == [] set configfile=%configfile:"=%
 
 :: Construct the signal using the unique GS2 installation
-:: directory (after replacing colons and backslashes)
-for /F "delims=*" %%T in ('"echo %GSDLHOME%| bin\windows\sed.exe s@[\\:]@_@g"') do set signal=%%T
+:: directory (after replacing spaces, colons and backslashes)
+set signal=%GSDLHOME: =_%
+for /F "delims=*" %%T in ('"echo %signal%| bin\windows\sed.exe s@[\\:]@_@g"') do set signal=%%T
 set GS2_APACHE_HTTPD_SIGNAL=GS2_APACHE_HTTPD_%signal%
+set signal=
 rem echo Signal is: %GS2_APACHE_HTTPD_SIGNAL%
 
@@ -183 +188 @@
 
 if exist "%GSDLHOME%\llssite.cfg" (
-  set configfile="%GSDLHOME%\llssite.cfg"
+  set configfile=%GSDLHOME%\llssite.cfg
   goto cfgport 
 )
@@ -191 +196 @@
 )
 copy "%GSDLHOME%\llssite.cfg.in" "%GSDLHOME%\llssite.cfg"
-set configfile="%GSDLHOME%\llssite.cfg"
+set configfile=%GSDLHOME%\llssite.cfg
 
 :cfgport
 echo Configuring the apache webserver...
 :: See http://ss64.com/nt/for_cmd.html, http://ss64.com/nt/findstr.html (and http://ss64.com/nt/find.html)
-FOR /F "tokens=2 delims==" %%G IN ('findstr /R ^portnumber %configfile%') do set port=%%G
-FOR /F "tokens=2 delims==" %%G IN ('findstr /R ^hostIP %configfile%') do set hostIP=%%G
-FOR /F "tokens=2 delims==" %%G IN ('findstr /R ^externalaccess %configfile%') do set allowfromall=%%G
+FOR /F "tokens=2 delims==" %%G IN ('findstr /R ^portnumber "%configfile%"') do set port=%%G
+FOR /F "tokens=2 delims==" %%G IN ('findstr /R ^hostIP "%configfile%"') do set hostIP=%%G
+FOR /F "tokens=2 delims==" %%G IN ('findstr /R ^externalaccess "%configfile%"') do set allowfromall=%%G
 
 if "%allowfromall%" == "1" set allowfromall="Allow"& goto portcon