larryi 01/09/09 14:59:55 Modified: src/shell startup.bat shutdown.bat Log: To better support separate "install" and "home" directories, search for "install" before defaulting to "home". Revision Changes Path 1.11 +12 -3 jakarta-tomcat/src/shell/startup.bat Index: startup.bat =================================================================== RCS file: /home/cvs/jakarta-tomcat/src/shell/startup.bat,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- startup.bat 2001/08/30 11:44:32 1.10 +++ startup.bat 2001/09/09 21:59:55 1.11 @@ -1,13 +1,17 @@ @echo off -rem $Id: startup.bat,v 1.10 2001/08/30 11:44:32 larryi Exp $ +rem $Id: startup.bat,v 1.11 2001/09/09 21:59:55 larryi Exp $ rem Startup batch file for tomcat server. rem This batch file written and tested under Windows NT rem Improvements to this file are welcome -set _TC_BIN_DIR=%TOMCAT_HOME%\bin -if not "%_TC_BIN_DIR%" == "\bin" goto start +set _TC_BIN_DIR=%TOMCAT_INSTALL%\bin +if "%_TC_BIN_DIR%" == "\bin" goto search +if exist "%_TC_BIN_DIR%\tomcat.bat" goto start +echo tomcat.bat not found at TOMCAT_INSTALL = %TOMCAT_INSTALL% +goto eof +:search set _TC_BIN_DIR=.\bin if exist "%_TC_BIN_DIR%\tomcat.bat" goto start @@ -17,6 +21,11 @@ set _TC_BIN_DIR=..\bin if exist "%_TC_BIN_DIR%\tomcat.bat" goto start +set _TC_BIN_DIR=%TOMCAT_HOME%\bin +if "%_TC_BIN_DIR%" == "\bin" goto notFound +if exist "%_TC_BIN_DIR%\tomcat.bat" goto start + +:notFound echo Unable to determine the location of Tomcat. goto eof 1.8 +12 -3 jakarta-tomcat/src/shell/shutdown.bat Index: shutdown.bat =================================================================== RCS file: /home/cvs/jakarta-tomcat/src/shell/shutdown.bat,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- shutdown.bat 2001/08/30 11:44:32 1.7 +++ shutdown.bat 2001/09/09 21:59:55 1.8 @@ -1,10 +1,14 @@ @echo off -rem $Id: shutdown.bat,v 1.7 2001/08/30 11:44:32 larryi Exp $ +rem $Id: shutdown.bat,v 1.8 2001/09/09 21:59:55 larryi Exp $ rem Startup batch file for tomcat server. -set _TC_BIN_DIR=%TOMCAT_HOME%\bin -if not "%_TC_BIN_DIR%" == "\bin" goto start +set _TC_BIN_DIR=%TOMCAT_INSTALL%\bin +if "%_TC_BIN_DIR%" == "\bin" goto search +if exist "%_TC_BIN_DIR%\tomcat.bat" goto start +echo tomcat.bat not found at TOMCAT_INSTALL = %TOMCAT_INSTALL% +goto eof +:search set _TC_BIN_DIR=.\bin if exist "%_TC_BIN_DIR%\tomcat.bat" goto start @@ -14,6 +18,11 @@ set _TC_BIN_DIR=..\bin if exist "%_TC_BIN_DIR%\tomcat.bat" goto start +set _TC_BIN_DIR=%TOMCAT_HOME%\bin +if "%_TC_BIN_DIR%" == "\bin" goto notFound +if exist "%_TC_BIN_DIR%\tomcat.bat" goto start + +:notFound echo Unable to determine the location of Tomcat. goto eof
