You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by la...@apache.org on 2001/08/30 13:45:53 UTC
cvs commit: jakarta-tomcat/src/shell tomcatEnv.bat
larryi 01/08/30 04:45:53
Modified: src/shell tomcatEnv.bat
Log:
Modify to not set TOMCAT_HOME so tomcat.bat can always guess if
TOMCAT_HOME hasn't been set by the user.
Fix passing of arguments for Win9x.
Revision Changes Path
1.6 +15 -8 jakarta-tomcat/src/shell/tomcatEnv.bat
Index: tomcatEnv.bat
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/shell/tomcatEnv.bat,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- tomcatEnv.bat 2000/09/04 21:24:49 1.5
+++ tomcatEnv.bat 2001/08/30 11:45:53 1.6
@@ -4,27 +4,34 @@
set TOM_PREV_CLASSPATH=%CLASSPATH%
set TOM_PREV_HOME=%TOMCAT_HOME%
+set TOM_PREV_INSTALL=%TOMCAT_INSTALL%
-if not "%TOMCAT_HOME%" == "" goto start
+set _TC_BIN_DIR=%TOMCAT_HOME%\bin
+if not "%_TC_BIN_DIR%" == "\bin" goto start
-SET TOMCAT_HOME=.
-if exist "%TOMCAT_HOME%\bin\tomcat.bat" goto start
+set _TC_BIN_DIR=.\bin
+if exist "%_TC_BIN_DIR%\tomcat.bat" goto start
-SET TOMCAT_HOME=..
-if exist "%TOMCAT_HOME%\bin\tomcat.bat" goto start
+set _TC_BIN_DIR=.
+if exist "%_TC_BIN_DIR%\tomcat.bat" goto start
-SET TOMCAT_HOME=
-echo Unable to determine the value of TOMCAT_HOME.
+set _TC_BIN_DIR=..\bin
+if exist "%_TC_BIN_DIR%\tomcat.bat" goto start
+
+echo Unable to determine the location of Tomcat.
goto eof
:start
-call "%TOMCAT_HOME%\bin\tomcat" env %*
+call "%_TC_BIN_DIR%\tomcat" env %1 %2 %3 %4 %5 %6 %7 %8 %9
goto eof
:restore
set CLASSPATH=%TOM_PREV_CLASSPATH%
set TOMCAT_HOME=%TOM_PREV_HOME%
+set TOMCAT_INSTALL=%TOM_PREV_INSTALL%
set TOM_PREV_CLASSPATH=
set TOM_PREV_HOME=
+set TOM_PREV_INSTALL=
:eof
+set _TC_BIN_DIR=