larryi 01/09/01 14:02:03
Modified: src/shell tomcat.bat
Log:
Need to try ".." too when guessing TOMCAT_HOME and
TOMCAT_INSTALL.
Reported by: Ignacio J. Ortega
Revision Changes Path
1.43 +5 -1 jakarta-tomcat/src/shell/tomcat.bat
Index: tomcat.bat
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/shell/tomcat.bat,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- tomcat.bat 2001/09/01 15:28:11 1.42
+++ tomcat.bat 2001/09/01 21:02:03 1.43
@@ -29,7 +29,7 @@
rem Tomcat, refer to the Tomcat Users Guide (tomcat_ug.html found
rem in the "doc" directory.
rem
-rem $Id: tomcat.bat,v 1.42 2001/09/01 15:28:11 larryi Exp $
+rem $Id: tomcat.bat,v 1.43 2001/09/01 21:02:03 larryi Exp $
rem -------------------------------------------------------------------------
@@ -59,6 +59,8 @@
if not "%TOMCAT_HOME%" == "" goto gotTcHome
set TOMCAT_HOME=.
+if exist "%TOMCAT_HOME%\conf\%_NULL%" goto okTcHome
+set TOMCAT_HOME=..
:gotTcHome
if exist "%TOMCAT_HOME%\conf\%_NULL%" goto okTcHome
echo "%TOMCAT_HOME%\conf" not found.
@@ -68,6 +70,8 @@
if not "%TOMCAT_INSTALL%" == "" goto gotTcInstall
set TOMCAT_INSTALL=.
+if exist "%TOMCAT_INSTALL%\lib\tomcat.jar" goto okTcInstall
+set TOMCAT_INSTALL=..
if exist "%TOMCAT_INSTALL%\lib\tomcat.jar" goto okTcInstall
set TOMCAT_INSTALL=%TOMCAT_HOME%
:gotTcInstall
