Return-Path: Delivered-To: apmail-jakarta-tomcat-dev-archive@apache.org Received: (qmail 72543 invoked from network); 1 Feb 2002 22:49:27 -0000 Received: from unknown (HELO nagoya.betaversion.org) (192.18.49.131) by daedalus.apache.org with SMTP; 1 Feb 2002 22:49:27 -0000 Received: (qmail 15281 invoked by uid 97); 1 Feb 2002 22:49:14 -0000 Delivered-To: qmlist-jakarta-archive-tomcat-dev@jakarta.apache.org Received: (qmail 15211 invoked by uid 97); 1 Feb 2002 22:49:13 -0000 Mailing-List: contact tomcat-dev-help@jakarta.apache.org; run by ezmlm Precedence: bulk List-Unsubscribe: List-Subscribe: List-Help: List-Post: List-Id: "Tomcat Developers List" Reply-To: "Tomcat Developers List" Delivered-To: mailing list tomcat-dev@jakarta.apache.org Received: (qmail 8581 invoked from network); 1 Feb 2002 22:13:53 -0000 Message-ID: From: Stephen Paulsen To: "'tomcat-dev@jakarta.apache.org'" Subject: [PATCH] for catalina.bat Date: Fri, 1 Feb 2002 14:12:56 -0800 MIME-Version: 1.0 X-Mailer: Internet Mail Service (5.5.2653.19) Content-Type: text/plain; charset="iso-8859-1" X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N --- 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" ' 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: For additional commands, e-mail: