Changeset 20436

Show
Ignore:
Timestamp:
28.08.2009 22:03:21 (10 years ago)
Author:
ak19
Message:

Setup.bat wasn't being called when GSDLOS was not yet set. This caused the server start request to fail when the user pressed the Enter Library button. Now we check for GSDLOS (as well as GSDLHOME) being set and if either aren't, setup.bat is called.

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • gsdl/trunk/gs2-server.bat

    r20392 r20436  
    2525echo GS2 Home: %GSDLHOME% 
    2626 
    27 ::goto autoset_gsdl_home %gsdl2path% 
    28  
    2927:: Setup Greenstone2, unless it has already been done 
    30 if "%GSDLHOME%" == "" ( 
    31    pushd "%GSDLHOME%" 
     28:: If either GSDLHOME or GSDLOS is not set, need to run setup.bat first 
     29:: OR operations in an IF stmt: http://fixunix.com/ms-dos/21057-how-implement-if-condition-batch-file.html 
     30for %%i in ("%GSDLOS%" "%GSDLHOME%") do if %%i == "" set OR=True 
     31if "%OR%" == "True" ( 
     32   pushd "%gsdl2path%" 
    3233   call setup.bat 
     34   echo **** GSDLOS: %GSDLOS% and GSDLHOME: %GSDLHOME% 
    3335   popd 
    3436)