View | Details | Raw Unified | Return to bug 31623
Collapse All | Expand All

(-)jakarta-tomcat-catalina/catalina/src/bin/setclasspath.sh.orig (-2 / +2 lines)
Lines 10-16 Link Here
10
  echo "This environment variable is needed to run this program"
10
  echo "This environment variable is needed to run this program"
11
  exit 1
11
  exit 1
12
fi
12
fi
13
if $os400; then
13
if [ "$os400" = "true" ]; then
14
  if [ ! -x "$JAVA_HOME"/bin/java -o ! -x "$JAVA_HOME"/bin/javac ]; then
14
  if [ ! -x "$JAVA_HOME"/bin/java -o ! -x "$JAVA_HOME"/bin/javac ]; then
15
    echo "The JAVA_HOME environment variable is not defined correctly"
15
    echo "The JAVA_HOME environment variable is not defined correctly"
16
    echo "This environment variable is needed to run this program"
16
    echo "This environment variable is needed to run this program"
Lines 55-61 Link Here
55
55
56
# Set standard commands for invoking Java.
56
# Set standard commands for invoking Java.
57
_RUNJAVA="$JAVA_HOME"/bin/java
57
_RUNJAVA="$JAVA_HOME"/bin/java
58
if [ $os400 = false ]; then
58
if [ "$os400" != "true" ]; then
59
  _RUNJDB="$JAVA_HOME"/bin/jdb
59
  _RUNJDB="$JAVA_HOME"/bin/jdb
60
fi
60
fi
61
_RUNJAVAC="$JAVA_HOME"/bin/javac
61
_RUNJAVAC="$JAVA_HOME"/bin/javac

Return to bug 31623