Author: markt Date: Wed Jul 13 15:20:43 2011 New Revision: 1146096 URL: http://svn.apache.org/viewvc?rev=1146096&view=rev Log: CATALINA_BASE is always set, so simplify
Modified: tomcat/trunk/bin/catalina.bat Modified: tomcat/trunk/bin/catalina.bat URL: http://svn.apache.org/viewvc/tomcat/trunk/bin/catalina.bat?rev=1146096&r1=1146095&r2=1146096&view=diff ============================================================================== --- tomcat/trunk/bin/catalina.bat (original) +++ tomcat/trunk/bin/catalina.bat Wed Jul 13 15:20:43 2011 @@ -137,12 +137,12 @@ rem but allow them to be specified in se set CLASSPATH= rem Get standard environment variables -if "%CATALINA_BASE%" == "" goto gotSetenvHome -if exist "%CATALINA_BASE%\bin\setenv.bat" call "%CATALINA_BASE%\bin\setenv.bat" -goto gotSetenvBase -:gotSetenvHome +if not exist "%CATALINA_BASE%\bin\setenv.bat" goto checkSetenvHome +call "%CATALINA_BASE%\bin\setenv.bat" +goto setenvDone +:checkSetenvHome if exist "%CATALINA_HOME%\bin\setenv.bat" call "%CATALINA_HOME%\bin\setenv.bat" -:gotSetenvBase +:setenvDone rem Get standard Java environment variables if exist "%CATALINA_HOME%\bin\setclasspath.bat" goto okSetclasspath --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org