Changeset 20478 for gsdl/trunk/gs2-server.bat

Timestamp:

2009-09-02T13:15:07+12:00 (15 years ago)

Author:

ak19

Message:

When gs2-server.bat is called with the glisite.cfg configfile, it means it's launched through GLI. In that case an extra DOS prompt would have been launched and would need to be closed upon exit. So gs2-server.bat now makes a call to the batch cmd exit when it's launched with glisite.cfg.

File:

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

gsdl/trunk/gs2-server.bat

@@ -120 +120 @@
 :: Need to find Java. If found, JAVA_EXECUTABLE will be set
 :: call findjava.bat %serverlang% %PROGNAME%
-call findjava.bat
+call "%GSDLHOME%\findjava.bat"
 if "%JAVA_EXECUTABLE%" == "" echo **** No Java executable found& goto exit
 
@@ -127 +127 @@
 echo.
 "%JAVA_EXECUTABLE%" org.greenstone.server.Server2 "%GSDLHOME%" "%serverlang%" %*
+::echo ******* Second argument to gs2-server.bat is: %2
+:: The 1st argument to gs2-server.bat (if any) would be --config, the 2nd is the config
+:: filename if it 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.
+if "%2" == "%GSDLHOME%\glisite.cfg" goto quitcmd
 goto exit
 
+:: Exit the batch script (close the console)
+:quitcmd
+popd
+ENDLOCAL
+exit 0
+
+:: Just end the script without closing the console
 :exit
 popd