You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2004/07/27 00:01:19 UTC
cvs commit: jakarta-tomcat-catalina/catalina/src/bin setclasspath.sh
markt 2004/07/26 15:01:19
Modified: catalina/src/bin setclasspath.sh
Log:
Fix bug 12056. Test for execute rather than read permissions since execute is what we need.
Add missing JDK not JRE warning.
- Ported from TC4
Revision Changes Path
1.8 +5 -4 jakarta-tomcat-catalina/catalina/src/bin/setclasspath.sh
Index: setclasspath.sh
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/bin/setclasspath.sh,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- setclasspath.sh 12 Feb 2004 21:38:56 -0000 1.7
+++ setclasspath.sh 26 Jul 2004 22:01:19 -0000 1.8
@@ -11,13 +11,14 @@
exit 1
fi
if $os400; then
- if [ ! -r "$JAVA_HOME"/bin/java -o ! -r "$JAVA_HOME"/bin/javac ]; then
+ if [ ! -x "$JAVA_HOME"/bin/java -o ! -x "$JAVA_HOME"/bin/javac ]; then
echo "The JAVA_HOME environment variable is not defined correctly"
echo "This environment variable is needed to run this program"
+ echo "NB: JAVA_HOME should point to a JDK not a JRE"
exit 1
fi
else
- if [ ! -r "$JAVA_HOME"/bin/java -o ! -r "$JAVA_HOME"/bin/jdb -o ! -r "$JAVA_HOME"/bin/javac ]; then
+ if [ ! -x "$JAVA_HOME"/bin/java -o ! -x "$JAVA_HOME"/bin/jdb -o ! -x "$JAVA_HOME"/bin/javac ]; then
echo "The JAVA_HOME environment variable is not defined correctly"
echo "This environment variable is needed to run this program"
echo "NB: JAVA_HOME should point to a JDK not a JRE"
@@ -29,7 +30,7 @@
echo "This environment variable is needed to run this program"
exit 1
fi
-if [ ! -r "$BASEDIR"/bin/setclasspath.sh ]; then
+if [ ! -x "$BASEDIR"/bin/setclasspath.sh ]; then
echo "The BASEDIR environment variable is not defined correctly"
echo "This environment variable is needed to run this program"
exit 1
---------------------------------------------------------------------
To unsubscribe, e-mail: tomcat-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: tomcat-dev-help@jakarta.apache.org