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

(-)a/bin/daemon.sh.orig (+9 lines)
Lines 96-101 if [ -z "$JAVA_HOME" ]; then Link Here
96
    JAVA_BIN="`which java 2>/dev/null || type java 2>&1`"
96
    JAVA_BIN="`which java 2>/dev/null || type java 2>&1`"
97
    test -x "$JAVA_BIN" && JAVA_HOME="`dirname $JAVA_BIN`"
97
    test -x "$JAVA_BIN" && JAVA_HOME="`dirname $JAVA_BIN`"
98
    test ".$JAVA_HOME" != . && JAVA_HOME=`cd "$JAVA_HOME/.." >/dev/null; pwd`
98
    test ".$JAVA_HOME" != . && JAVA_HOME=`cd "$JAVA_HOME/.." >/dev/null; pwd`
99
100
    # If JAVA_HOME is /usr, then try and use another fallback here
101
    if [[ "$JAVA_HOME" == "/usr" ]]; then
102
        if [[ `test -d "/usr/lib/jvm/java"` -eq 0 ]]; then
103
            JAVA_HOME="/usr/lib/jvm/java"
104
        elif [[ `test -d "/usr/lib/jvm/jre"` -eq 0 ]]; then
105
            JAVA_HOME="/usr/lib/jvm/jre"
106
        fi
107
    fi
99
else
108
else
100
    JAVA_BIN="$JAVA_HOME/bin/java"
109
    JAVA_BIN="$JAVA_HOME/bin/java"
101
fi
110
fi

Return to bug 61441