From 2d7afeddfe3d6aa5e61ca6f20cf2f2fc75f973fb Mon Sep 17 00:00:00 2001 From: rjung Date: Mon, 20 Jun 2011 09:52:16 +0000 Subject: [PATCH] - Clarify JRE_HOME in catalina.sh - sort OS detection by OS name git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1137567 13f79535-47bb-0310-9956-ffa450edef68 --- bin/catalina.sh | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/bin/catalina.sh b/bin/catalina.sh index 0fdd96897..03ec671e5 100755 --- a/bin/catalina.sh +++ b/bin/catalina.sh @@ -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 -- 2.11.0