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

(-)catalina.sh-orig (-1 / +1 lines)
Lines 99-105 Link Here
99
PRGDIR=`dirname "$PRG"`
99
PRGDIR=`dirname "$PRG"`
100
100
101
# Only set CATALINA_HOME if not already set
101
# Only set CATALINA_HOME if not already set
102
[ -z "$CATALINA_HOME" ] && CATALINA_HOME=`cd "$PRGDIR/.." ; pwd`
102
[ -z "$CATALINA_HOME" ] && CATALINA_HOME=`cd "$PRGDIR/.." >/dev/null 2>&1 ; pwd`
103
103
104
if [ -r "$CATALINA_BASE"/bin/setenv.sh ]; then
104
if [ -r "$CATALINA_BASE"/bin/setenv.sh ]; then
105
  . "$CATALINA_BASE"/bin/setenv.sh
105
  . "$CATALINA_BASE"/bin/setenv.sh

Return to bug 48840