From: jfclere <jfclere@13f79535-47bb-0310-9956-ffa450edef68>
Date: Fri, 9 Feb 2007 10:33:43 +0000 (+0000)
Subject: Don't add tools.jar if it is not existing.
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=bb2b76b481ecc543ddf627abb9d6fc07449560e4;p=tomcat7.0

Don't add tools.jar if it is not existing.


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

diff --git a/bin/setclasspath.sh b/bin/setclasspath.sh
index f884d23b1..9250c8713 100755
--- a/bin/setclasspath.sh
+++ b/bin/setclasspath.sh
@@ -68,8 +68,17 @@ fi
 JAVA_ENDORSED_DIRS="$BASEDIR"/endorsed
 
 # Set standard CLASSPATH
+if [ "$1" = "javac" ] ; then
+  if [ ! -f "$JAVA_HOME"/lib/tools.jar ]; then
+    echo "Can't find tools.jar in JAVA_HOME"
+    echo "Need a JDK to run javac"
+    exit 1
+  fi
+fi
 if [ "$1" = "debug" -o "$1" = "javac" ] ; then
-  CLASSPATH="$JAVA_HOME"/lib/tools.jar
+  if [ -f "$JAVA_HOME"/lib/tools.jar ]; then
+    CLASSPATH="$JAVA_HOME"/lib/tools.jar
+  fi
 fi
 
 # OSX hack to CLASSPATH