Changeset 20436

Timestamp:

2009-08-28T22:03:21+12:00 (15 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.

File:

• gsdl/trunk/gs2-server.bat (modified) (1 diff)

gsdl/trunk/gs2-server.bat

@@ -25 +25 @@
 echo GS2 Home: %GSDLHOME%
 
-::goto autoset_gsdl_home %gsdl2path%
-
 :: Setup Greenstone2, unless it has already been done
-if "%GSDLHOME%" == "" (
-   pushd "%GSDLHOME%"
+:: If either GSDLHOME or GSDLOS is not set, need to run setup.bat first
+:: OR operations in an IF stmt: http://fixunix.com/ms-dos/21057-how-implement-if-condition-batch-file.html
+for %%i in ("%GSDLOS%" "%GSDLHOME%") do if %%i == "" set OR=True
+if "%OR%" == "True" (
+   pushd "%gsdl2path%"
    call setup.bat
+   echo **** GSDLOS: %GSDLOS% and GSDLHOME: %GSDLHOME%
    popd
 )