Changeset 20338

Timestamp:

2009-08-19T17:57:42+12:00 (15 years ago)

Author:

ak19

Message:

1. Better not to call EXIT from this batch script after all (since this exits the console too) and won't show the output error messages. Instead, upon an error it merely prints a useful message. 2. Changed some of the lines to not create redundant variables, program runs tidier.

File:

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

gsdl/trunk/gsicontrol.bat

@@ -52 +52 @@
 :testgsdl
 if NOT "%GSDLHOME%" == "" if NOT "%GSDLOS%" == "" goto commands
-        echo.
-    echo Environment variable GSDLHOME (or GSDLOS) not set.
-    echo   This needs to be set to run the gsicontrol command %target%.
-    echo   Have you run setup.bat?
-    echo.
-    goto exit
+echo.
+echo Environment variable GSDLHOME (or GSDLOS) not set.
+echo   This needs to be set to run the gsicontrol command %target%.
+echo   Have you run setup.bat?
+echo.
+goto exit
 
 
@@ -71 +71 @@
 if "%target%" == "web-stop" goto stop
 if "%target%" == "web-restart" goto restart
-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
@@ -80 +78 @@
 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
+rem if "%target%" == "web-status" goto status
+rem if "%target%" == "web-graceful" goto graceful
+if "%target%" == "set-port" goto setport
+:: unknown command
+echo Command unrecognised: %target%
+goto usage
+
 
 :start
@@ -109 +110 @@
 goto start
 
-:status
-:graceful
-::echo Command %target% is not yet operational (no local apache web server included in this release).
-goto exit
-
-::configure-web
-::configure-cgi
-:cfgweb
-:cfgcgi
-if exist "%GSDLHOME%\cgi-bin\gsdlsite.cfg" goto cgimsg
-    echo Configuring cgi-bin\gsdlsite.cfg
-    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
-
-:cgimsg
-echo WARNING: Nothing done for make configure-cgi.
-echo    If you wish to regenerate the file
-echo    %GSDLHOME%\cgi-bin\gsdlsite.cfg
-echo    from scratch, delete the existing file first.
-echo.
-
-:cgifin
-if "%target%" == "configure-cgi" goto exit
-if "%target%" == "configure-web" goto cfgapach
-
-::configure-apache
-:cfgapach
-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"
-    goto exit
+::status
+::graceful
+::echo Command %target% is not operational on this operating system
+::goto exit
+
 
 ::configure-admin
@@ -170 +142 @@
 goto exit
 
+
+::configure-web
+::configure-cgi
+:cfgweb
+:cfgcgi
+if exist "%GSDLHOME%\cgi-bin\gsdlsite.cfg" goto cgimsg
+echo Configuring cgi-bin\gsdlsite.cfg
+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
+
+:cgimsg
+echo WARNING: Nothing done for configure-cgi.
+echo    If you wish to regenerate the file
+echo    %GSDLHOME%\cgi-bin\gsdlsite.cfg
+echo    from scratch, delete the existing file first.
+echo.
+
+:cgifin
+if "%target%" == "configure-cgi" goto exit
+if "%target%" == "configure-web" goto cfgapach
+
+::configure-apache
+:cfgapach
+if not "%configfile%" == "" if exist "%configfile%" (goto cfgport) else (echo Config file %configfile% does not exist. Using default llssite.cfg)
+
+if exist "%GSDLHOME%\llssite.cfg" (
+  set configfile="%GSDLHOME%\llssite.cfg"
+  goto cfgport 
+)
+if not exist "%GSDLHOME%\llssite.cfg.in" (
+  echo Unable to proceed as neither %GSDLHOME%\llssite.cfg nor %GSDLHOME%\llssite.cfg.in could be found
+  goto exit
+)
+copy "%GSDLHOME%\llssite.cfg.in" "%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
+echo Found port %port%
+FOR /F "tokens=2 delims==" %%G IN ('findstr /R ^externalaccess %configfile%') do set connect=%%G
+if "%connect%" == "1" (set connect=yes) else (set connect=no)
+
+:: Using CALL to jump to labels means we can return from them. BUT need to ensure
+:: that command extensions are enabled to call labels. So just use GOTO instead.
+::http://ss64.com/nt/call.html
+goto portcon
+
 ::configure-port-and-connection
-:portcon1
+:setport
 set /p port=Enter port number to use:
 set /p connect=Allow external connections [yes/no]:
+
+:portcon
 if "%connect%" == "yes" set allowfrom="all" goto portcon2
 if "%connect%" == "y" set allowfrom="all" goto portcon2
 set allowfrom="127.0.0.1"
+goto portcon2
 
 :portcon2
-if "%port%" == "" echo Done& goto exit
-    set _sed="bin\windows\sed.exe"
-    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_SIGNAL% SILENT
-    echo Setting config file to use port %port%
-    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%
+if "%port%" == "" (
     echo Done
-    set port=
-    set connect=
-    set allowfrom=
-    set _sed=
-    set safepath=
-
+    goto exit
+)
+set _sed="bin\windows\sed.exe"
+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_SIGNAL% SILENT
+echo Setting config file to use port %port%
+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%
+echo Done
+
+set connect=
+set allowfrom=
+set _sed=
+set safepath=
+
+:: Extra processing for configure-web and configure-cgi command targets
+if not "%target%" == "cfgweb" goto exit
+if not "%target%" == "cfgcgi" goto exit
+if exist "%GSDLHOME%\apache-httpd\%GSDLOS%\conf\httpd.conf" (echo %MONITOR_SUCCESS%) else (echo %MONITOR_FAILED%)
+echo %MONITOR_FINISHED%
+set port=
+set externalaccess=
+goto exit
 
 :exit
 endlocal
+
+
+