Commit 39070a44 authored by Daryl Herzmann's avatar Daryl Herzmann Committed by akrherz

support more java paths in debian init script, fixes OF-718


git-svn-id: http://svn.igniterealtime.org/svn/repos/openfire/trunk@13833 b35dd754-fafc-0310-a699-88a17e54d16e
parent 044846f3
...@@ -27,8 +27,10 @@ if [ -z $JAVA_HOME ]; then ...@@ -27,8 +27,10 @@ if [ -z $JAVA_HOME ]; then
/usr/lib/jvm/java-6-sun \ /usr/lib/jvm/java-6-sun \
/usr/lib/jvm/java-1.5.0-sun \ /usr/lib/jvm/java-1.5.0-sun \
/usr/lib/jvm/java-7-openjdk-amd64 \ /usr/lib/jvm/java-7-openjdk-amd64 \
/usr/lib/jvm/java-7-openjdk-i386 \
/usr/lib/jvm/java-7-openjdk \ /usr/lib/jvm/java-7-openjdk \
/usr/lib/jvm/java-6-openjdk-amd64 \ /usr/lib/jvm/java-6-openjdk-amd64 \
/usr/lib/jvm/java-6-openjdk-i386 \
/usr/lib/jvm/java-6-openjdk" /usr/lib/jvm/java-6-openjdk"
for t in $JAVA_HOMES ; do for t in $JAVA_HOMES ; do
if [ -d $t ] ; then if [ -d $t ] ; then
...@@ -45,7 +47,7 @@ DESC=openfire ...@@ -45,7 +47,7 @@ DESC=openfire
DAEMON_DIR=/usr/share/openfire DAEMON_DIR=/usr/share/openfire
DAEMON_LIB=${DAEMON_DIR}/lib DAEMON_LIB=${DAEMON_DIR}/lib
test -x $JAVA || exit 0 test -x $JAVA || exit 1
# Include openfire defaults if available # Include openfire defaults if available
if [ -f /etc/default/openfire ] ; then if [ -f /etc/default/openfire ] ; then
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment