Commit 554c8967 authored by Daniel Henninger's avatar Daniel Henninger Committed by dhenninger

Fixed stupid bug.

git-svn-id: http://svn.igniterealtime.org/svn/repos/openfire/trunk@8256 b35dd754-fafc-0310-a699-88a17e54d16e
parent c426519b
......@@ -31,7 +31,7 @@ RETVAL=0
[ -z "$OPENFIRE_USER" ] && OPENFIRE_USER="daemon"
# If pid file path is not set in sysconfig, set to /var/run/openfire.pid.
[ -z "$OPENFIRE_PIDFILE" ] && OPENFIRE_PIDFILE="/var/run/${PROG}.pid"
[ -z "$OPENFIRE_PIDFILE" ] && OPENFIRE_PIDFILE="/var/run/openfire.pid"
# -----------------------------------------------------------------
......@@ -59,7 +59,7 @@ if [ -z "$JAVA_HOME" ]; then
if [ -d "${OPENFIRE_HOME}/jre" ]; then
JAVA_HOME="${OPENFIRE_HOME}/jre"
elif [ -d "/etc/alternatives/jre" ]; then
JAVA_HOME="${OPENFIRE_HOME}/jre"
JAVA_HOME="/etc/alternatives/jre"
else
jdks=`ls -r1d /usr/java/j*`
for jdk in $jdks; do
......@@ -112,9 +112,10 @@ start() {
su -s /bin/sh -c "$OPENFIRE_RUN_CMD" $OPENFIRE_USER > nohup.out 2>&1 &
RETVAL=$?
PID=$!
if [ $RETVAL -eq 0 -a ! -z "$OPENFIRE_PIDFILE" ]; then
echo $! > $OPENFIRE_PIDFILE
echo $PID > $OPENFIRE_PIDFILE
fi
echo
......
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