markt       2004/07/26 14:29:42

  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.
  
  Revision  Changes    Path
  1.13      +5 -4      jakarta-tomcat-4.0/catalina/src/bin/setclasspath.sh
  
  Index: setclasspath.sh
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/bin/setclasspath.sh,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- setclasspath.sh   12 Feb 2004 21:38:12 -0000      1.12
  +++ setclasspath.sh   26 Jul 2004 21:29:42 -0000      1.13
  @@ -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: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to