Author: rjung Date: Mon Jun 20 09:52:16 2011 New Revision: 1137567 URL: http://svn.apache.org/viewvc?rev=1137567&view=rev Log: - Clarify JRE_HOME in catalina.sh - sort OS detection by OS name
Modified: tomcat/trunk/bin/catalina.sh Modified: tomcat/trunk/bin/catalina.sh URL: http://svn.apache.org/viewvc/tomcat/trunk/bin/catalina.sh?rev=1137567&r1=1137566&r2=1137567&view=diff ============================================================================== --- tomcat/trunk/bin/catalina.sh (original) +++ tomcat/trunk/bin/catalina.sh Mon Jun 20 09:52:16 2011 @@ -16,7 +16,7 @@ # limitations under the License. # ----------------------------------------------------------------------------- -# Start/Stop Script for the CATALINA Server +# Control Script for the CATALINA Server # # Environment Variable Prerequisites # @@ -40,8 +40,9 @@ # JAVA_HOME Must point at your Java Development Kit installation. # Required to run the with the "debug" argument. # -# JRE_HOME Must point at your Java Development Kit installation. -# Defaults to JAVA_HOME if empty. +# JRE_HOME Must point at your Java Runtime installation. +# Defaults to JAVA_HOME if empty. If JRE_HOME and JAVA_HOME +# are both set, JRE_HOME is used. # # JAVA_OPTS (Optional) Java runtime options used when the "start", # "stop", or "run" command is executed. @@ -87,12 +88,12 @@ # OS specific support. $var _must_ be set to either true or false. cygwin=false -os400=false darwin=false +os400=false case "`uname`" in CYGWIN*) cygwin=true;; -OS400*) os400=true;; Darwin*) darwin=true;; +OS400*) os400=true;; esac # resolve links - $0 may be a softlink --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org