Changeset 22084

Show
Ignore:
Timestamp:
13.05.2010 17:36:15 (9 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.

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone2/gs2-server.bat

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