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

(-)./catalina.sh.orig (+2 lines)
Lines 45-53 Link Here
45
# OS specific support.  $var _must_ be set to either true or false.
45
# OS specific support.  $var _must_ be set to either true or false.
46
cygwin=false
46
cygwin=false
47
os400=false
47
os400=false
48
darwin=false
48
case "`uname`" in
49
case "`uname`" in
49
CYGWIN*) cygwin=true;;
50
CYGWIN*) cygwin=true;;
50
OS400*) os400=true;;
51
OS400*) os400=true;;
52
Darwin*) darwin=true;;
51
esac
53
esac
52
54
53
# resolve links - $0 may be a softlink
55
# resolve links - $0 may be a softlink
(-)./setclasspath.sh.orig (-3 / +7 lines)
Lines 10-18 Link Here
10
10
11
# Make sure prerequisite environment variables are set
11
# Make sure prerequisite environment variables are set
12
if [ -z "$JAVA_HOME" -a -z "$JRE_HOME" ]; then
12
if [ -z "$JAVA_HOME" -a -z "$JRE_HOME" ]; then
13
  echo "Neither the JAVA_HOME nor the JRE_HOME environment variable is defined"
13
  if $darwin && [ -d "/System/Library/Frameworks/JavaVM.framework/Versions/1.5/Home" ]; then
14
  echo "At least one of these environment variable is needed to run this program"
14
    export JAVA_HOME="/System/Library/Frameworks/JavaVM.framework/Versions/1.5/Home"
15
  exit 1
15
  else
16
    echo "Neither the JAVA_HOME nor the JRE_HOME environment variable is defined"
17
    echo "At least one of these environment variable is needed to run this program"
18
    exit 1
19
  fi
16
fi
20
fi
17
if [ -z "$JAVA_HOME" -a "$1" = "debug" ]; then
21
if [ -z "$JAVA_HOME" -a "$1" = "debug" ]; then
18
  echo "JAVA_HOME should point to a JDK in order to run in debug mode."
22
  echo "JAVA_HOME should point to a JDK in order to run in debug mode."
(-)./startup.sh.orig (+2 lines)
Lines 7-15 Link Here
7
7
8
# Better OS/400 detection: see Bugzilla 31132
8
# Better OS/400 detection: see Bugzilla 31132
9
os400=false
9
os400=false
10
darwin=false
10
case "`uname`" in
11
case "`uname`" in
11
CYGWIN*) cygwin=true;;
12
CYGWIN*) cygwin=true;;
12
OS400*) os400=true;;
13
OS400*) os400=true;;
14
Darwin*) darwin=true;;
13
esac
15
esac
14
16
15
# resolve links - $0 may be a softlink
17
# resolve links - $0 may be a softlink

Return to bug 37284