--- catalina.orig.bat   Fri Feb  1 13:39:47 2002
+++ catalina.bat        Fri Feb  1 13:47:34 2002
@@ -26,11 +26,12 @@
 
 rem ----- Save Environment Variables That May Change
--------------------------
 
-set _CATALINA_BASE=%CATALINA_BASE%
-set _CATALINA_HOME=%CATALINA_HOME%
-set _CLASSPATH=%CLASSPATH%
-set _CP=%CP%
-
+rem -- set _CATALINA_BASE=%CATALINA_BASE%
+rem -- set _CATALINA_HOME=%CATALINA_HOME%
+rem -- set _CLASSPATH=%CLASSPATH%
+rem -- set _CP=%CP%
+REM ----- Prevent environment changes from reaching outside this script
-------
+setlocal
 
 rem ----- Verify and Set Required Environment Variables
-----------------------
 
@@ -57,7 +58,8 @@
 
 rem ----- Prepare Appropriate Java Execution Commands
-------------------------
 
-if not "%OS%" == "Windows_NT" goto noTitle
+REM -- Why skip title for WinNT? `start "Your Title" <command>' works fine
on NT
+rem -- if not "%OS%" == "Windows_NT" goto noTitle
 set _STARTJAVA=start "Catalina" "%JAVA_HOME%\bin\java"
 set _RUNJAVA="%JAVA_HOME%\bin\java"
 goto gotTitle
@@ -124,14 +126,16 @@
 rem ----- Restore Environment Variables
---------------------------------------
 
 :cleanup
-set CATALINA_BASE=%_CATALINA_BASE%
-set _CATALINA_BASE=
-set CATALINA_HOME=%_CATALINA_HOME%
-set _CATALINA_HOME=
-set CLASSPATH=%_CLASSPATH%
-set _CLASSPATH=
-set CP=%_CP%
-set _LIBJARS=
-set _RUNJAVA=
-set _STARTJAVA=
+rem -- set CATALINA_BASE=%_CATALINA_BASE%
+rem -- set _CATALINA_BASE=
+rem -- set CATALINA_HOME=%_CATALINA_HOME%
+rem -- set _CATALINA_HOME=
+rem -- set CLASSPATH=%_CLASSPATH%
+rem -- set _CLASSPATH=
+rem -- set CP=%_CP%
+rem -- set _LIBJARS=
+rem -- set _RUNJAVA=
+rem -- set _STARTJAVA=
 :finish
+REM ----- End the effect of `setlocal'. Restore the previous environment.
-----
+endlocal

--
To unsubscribe, e-mail:   <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>

Reply via email to