From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Wed, 13 Jul 2011 14:47:32 +0000 (+0000)
Subject: CATALINA_BASE is always set, so simplify
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=d3a992280e3b7c075e5f7d911d358a161e0c9d84;p=tomcat7.0

CATALINA_BASE is always set, so simplify

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1146069 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/bin/catalina.sh b/bin/catalina.sh
index 0594fd3fb..a333fcb2f 100755
--- a/bin/catalina.sh
+++ b/bin/catalina.sh
@@ -133,9 +133,8 @@ PRGDIR=`dirname "$PRG"`
 # but allow them to be specified in setenv.sh, in rare case when it is needed.
 CLASSPATH=
 
-SETENVPATH="${CATALINA_BASE:-$CATALINA_HOME}"
-if [ -r "$SETENVPATH/bin/setenv.sh" ]; then
-  . "$SETENVPATH/bin/setenv.sh"
+if [ -r "$CATALINA_BASE/bin/setenv.sh" ]; then
+  . "$CATALINA_BASE/bin/setenv.sh"
 elif [ -r "$CATALINA_HOME/bin/setenv.sh" ]; then
   . "$CATALINA_HOME/bin/setenv.sh"
 fi