Changeset 22084 for main/trunk/greenstone2/gs2-server.bat

Timestamp:

2010-05-13T17:36:15+12:00 (14 years ago)

Author:

ak19

Message:

If no config file (llssite or glisite.cfg) is provided with the config flag, which can happen when gs2-server.bat is run on its own, then the batch file terminated with the message: goto is unexpected at this time. Fixed this.

File:

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

main/trunk/greenstone2/gs2-server.bat

@@ -164 +164 @@
 
 :: Store all parameters together in config file var: we may or may not have a portnumber
-:: Get everything after the "--quit=", if anything, and store it in port var.  If no port, nothing to do.
+:: Get everything after the "--quitport=", if anything, and store it in port var.  If no port, nothing to do.
 set conf=%*
+if "%conf%" == "" goto :runit
+
 set port=%conf:*--quitport=%
 if "%conf%" == "%port%" (
@@ -205 +207 @@
 :: Both are stored in %conf% now. If the config file is glisite.cfg, then this script was launched through
 :: GLI and would have opened a DOS console. Need to exit from this script then to close the console.
-:: Remove --config= prefix and do a case insensitive comparison, since filepaths can have uppercase chars
+:: Remove --config=prefix and do a case insensitive comparison, since filepaths can have uppercase chars
+if "%conf%" == "" goto exit
 if /i "%conf:~9%" == "%GSDLHOME%\glisite.cfg" goto quitcmd
 goto exit