Changeset 20262

Timestamp:

2009-08-14T20:14:24+12:00 (15 years ago)

Author:

ak19

Message:

The minor changes to make this script behave like the bash equivalent, before testing and committing the changes for configure-apache.

File:

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

gsdl/trunk/gsicontrol.bat

@@ -2 +2 @@
 
 setlocal
-set testdone=0
+::set testdone=0
 set target=%1
 set configfile=%2
+
+:: 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
+set GS2_APACHE_HTTPD_SIGNAL=GS2_APACHE_HTTPD_%signal%
+rem echo Signal is: %GS2_APACHE_HTTPD_SIGNAL%
 
 :: Need to get greenstone installation directory
@@ -15 +21 @@
 :: check that we have >=1 and <=2 arguments
 :chkargs
-if "%target%" == "" goto :usage
-if not "%3" == "" goto :usage
+if "%target%" == "" goto usage
+if not "%3" == "" goto usage
     goto begincmd
 
@@ -27 +33 @@
 echo    web-stop
 echo    web-restart
+::echo    web-status
+::echo    web-graceful
 echo    configure-admin
 echo    configure-web    [config-filename]
 echo    configure-apache [config-filename]
 echo    configure-cgi
-
-::echo    web-status
-::echo    web-graceful
-::echo    test-gsdlhome
-::echo    web-stop-tested
+echo    test-gsdlhome
+echo    web-stop-tested
 echo.
 goto exit
@@ -57 +62 @@
 ::MAIN MENU
 :commands
+echo. 
+echo Using:
+echo   GSDLHOME = %GSDLHOME%
+echo   GSDLOS = %GSDLOS%
+echo.
+
 if "%target%" == "web-start" goto start
 if "%target%" == "web-stop" goto stop
 if "%target%" == "web-restart" goto restart
-if "%target%" == "web-status" goto status
-if "%target%" == "web-graceful" goto graceful
+rem if "%target%" == "web-status" goto status
+rem if "%target%" == "web-graceful" goto graceful
 if "%target%" == "configure-admin" goto cfgadmin
 if "%target%" == "configure-web" goto cfgweb
 if "%target%" == "configure-apache" goto cfgapach
 if "%target%" == "configure-cgi" goto cfgcgi
-if "%target%" == "test-gsdlhome" goto testgsdl
+:: already tested gsdlhome (and web-stop-tested) above, don't want to keep looping on it
+if "%target%" == "test-gsdlhome" goto exit
+rem if "%target%" == "web-stop-tested" goto exit
 if "%target%" == "portcon" goto portcon1
     :: unknown command
+    echo Command unrecognised: %target%
     goto usage
 
@@ -74 +88 @@
 :: START starts the app in a new console named by the string following immediately thereafter
 :: then we start up apache-httpd and pass the signal that the stop command will respond to
-START "%GSDLHOME%\apachectl" "%GSDLHOME%\bin\windows\starthttpd.exe" GS2_APACHE_HTTPD "%GSDLHOME%\apache-httpd\windows\bin\httpd.exe"
+START "%GSDLHOME%\apachectl" "%GSDLHOME%\bin\windows\starthttpd.exe" %GS2_APACHE_HTTPD_SIGNAL% "%GSDLHOME%\apache-httpd\windows\bin\httpd.exe"
 echo %MONITOR_SUCCESS%
 echo %MONITOR_FINISHED%
@@ -80 +94 @@
 
 :stop
-if exist "%GSDLHOME%\apache-httpd\%GSDLOS%\conf\httpd.conf" "%GSDLHOME%\bin\windows\stophttpd.exe" GS2_APACHE_HTTPD
-rem if exist "%GSDLHOME%\apache-httpd\%GSDLOS%\conf\httpd.conf" "%GSDLHOME%\apache-httpd\%GSDLOS%\bin\apachectl" stop
+:stoptest
+if exist "%GSDLHOME%\apache-httpd\%GSDLOS%\conf\httpd.conf" "%GSDLHOME%\bin\windows\stophttpd.exe" %GS2_APACHE_HTTPD_SIGNAL%
+if "%target%" == "web-stop-tested" goto exit
 echo %MONITOR_SUCCESS%
-echo %MONITOR_FINISHED% 
+echo %MONITOR_FINISHED%
 goto exit
 
 :restart
-if exist "%GSDLHOME%\apache-httpd\%GSDLOS%\conf\httpd.conf" "%GSDLHOME%\bin\windows\stophttpd.exe" GS2_APACHE_HTTPD
-:: wait 2s, see http://malektips.com/dos0017.html. The 2 in the 2nd line is variable
+if exist "%GSDLHOME%\apache-httpd\%GSDLOS%\conf\httpd.conf" "%GSDLHOME%\bin\windows\stophttpd.exe" %GS2_APACHE_HTTPD_SIGNAL%
+:: wait 4s, see http://malektips.com/dos0017.html. The number in the 2nd line is variable (number of seconds to wait)
 ping 127.0.0.1 -n 2 -w 1000 > nul
-ping 127.0.0.1 -n 2 -w 1000> nul
-::"%GSDLHOME%\bin\windows\starthttpd.exe" GS2_APACHE_HTTPD "%GSDLHOME%\apache-httpd\windows\bin\httpd.exe"
+ping 127.0.0.1 -n 4 -w 1000> nul
+::"%GSDLHOME%\bin\windows\starthttpd.exe" %GS2_APACHE_HTTPD_SIGNAL% "%GSDLHOME%\apache-httpd\windows\bin\httpd.exe"
 goto start
 
@@ -97 +112 @@
 :graceful
 ::echo Command %target% is not yet operational (no local apache web server included in this release).
-goto exit
-
-:stoptest
-if exist "%GSDLHOME%\apache-httpd\%GSDLOS%\conf\httpd.conf" "%GSDLHOME%\bin\windows\stophttpd.exe" GS2_APACHE_HTTPD
-rem if exist "%GSDLHOME%\apache-httpd\%GSDLOS%\conf\httpd.conf" "%GSDLHOME%\apache-httpd\%GSDLOS%\bin\apachectl" stop
 goto exit
 
@@ -110 +120 @@
 if exist "%GSDLHOME%\cgi-bin\gsdlsite.cfg" goto cgimsg
     echo Configuring cgi-bin\gsdlsite.cfg
-    set gsdlpath=%GSDLHOME%
-    for /F "delims=*" %%T in ('"echo %gsdlpath%| bin\windows\sed.exe s@\\@\\\\@g"') do set safepath=%%T
-    bin\windows\sed.exe "s@\*\*GSDLHOME\*\*@\"%safepath%\"@g" cgi-bin/gsdlsite.cfg.in > cgi-bin/gsdlsite.cfg
-    set gsdlpath=
+    for /F "delims=*" %%T in ('"echo %GSDLHOME%| bin\windows\sed.exe s@\\@\\\\@g"') do set safepath=%%T
+    bin\windows\sed.exe "s@\*\*GSDLHOME\*\*@\"%safepath%\"@g" cgi-bin/gsdlsite.cfg.in > cgi-bin/gsdlsite.cfg    
     set safepath=
     goto cgifin
@@ -130 +138 @@
 ::configure-apache
 :cfgapach
-if exist "%GSDLHOME%\llssite.cfg" goto :exit 
-if not exist "%GSDLHOME%\llssite.cfg.in" goto :exit
+if exist "%GSDLHOME%\llssite.cfg" goto exit 
+if not exist "%GSDLHOME%\llssite.cfg.in" goto exit
     copy llssite.cfg.in llssite.cfg
     set configfile="%GSDLHOME%\llssite.cfg"
@@ -159 +167 @@
     echo Did not set password 
 )
+echo.
 goto exit
 
@@ -170 +179 @@
 
 :portcon2
-if "%port%" == "" goto exit
+if "%port%" == "" echo Done& goto exit
     set _sed="bin\windows\sed.exe"
-    set gsdlpath=%GSDLHOME%
-    for /F "delims=*" %%T in ('"echo %gsdlpath%| bin\windows\sed.exe s@\\@\/@g"') do set safepath=%%T
+    for /F "delims=*" %%T in ('"echo %GSDLHOME%| bin\windows\sed.exe s@\\@\/@g"') do set safepath=%%T
 
     echo Port: %port%
     echo Stopping web server (if running)
-    if not exist "%GSDLHOME%\apache-httpd\%GSDLOS%\conf\httpd.conf" echo missing conf file
-    if exist "%GSDLHOME%\apache-httpd\%GSDLOS%\conf\httpd.conf" "%GSDLHOME%\bin\windows\stophttpd.exe" GS2_APACHE_HTTPD SILENT
+    if not exist "%GSDLHOME%\apache-httpd\%GSDLOS%\conf\httpd.conf" echo Missing conf file
+    if exist "%GSDLHOME%\apache-httpd\%GSDLOS%\conf\httpd.conf" "%GSDLHOME%\bin\windows\stophttpd.exe" %GS2_APACHE_HTTPD_SIGNAL% SILENT
     echo Setting config file to use port %port%
-bin\windows\sed.exe "s@\*\*GSDLHOME\*\*@\"%safepath%\"@g" cgi-bin/gsdlsite.cfg.in > cgi-bin/gsdlsite.cfg
     type "%GSDLHOME%\apache-httpd\%GSDLOS%\conf\httpd.conf.in" | %_sed% "s@\*\*PORT\*\*@%port%@g" | %_sed% "s@\*\*CONNECTION\*\*@%allowfrom%@g" | %_sed% "s@\*\*GSDLHOME\*\*@%safepath%@g" | %_sed% "s@\*\*APACHE_HOME_OS\*\*@%safepath%\/apache-httpd\/%GSDLOS%@g" > "%GSDLHOME%\apache-httpd\%GSDLOS%\conf\httpd.conf"
     echo Type '%0 web-start' to start the web server running on port %port%
@@ -189 +196 @@
     set _sed=
     set safepath=
-    set gsdlpath=