You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by ak...@apache.org on 2006/03/11 08:25:27 UTC
svn commit: r385029 - in
/directory/branches/daemon/1.0/plugin/src/main/resources/org/apache/directory/daemon/installers:
izpack/server.init rpm/server.init
Author: akarasulu
Date: Fri Mar 10 23:25:25 2006
New Revision: 385029
URL: http://svn.apache.org/viewcvs?rev=385029&view=rev
Log:
fixing bugs in init script
Modified:
directory/branches/daemon/1.0/plugin/src/main/resources/org/apache/directory/daemon/installers/izpack/server.init
directory/branches/daemon/1.0/plugin/src/main/resources/org/apache/directory/daemon/installers/rpm/server.init
Modified: directory/branches/daemon/1.0/plugin/src/main/resources/org/apache/directory/daemon/installers/izpack/server.init
URL: http://svn.apache.org/viewcvs/directory/branches/daemon/1.0/plugin/src/main/resources/org/apache/directory/daemon/installers/izpack/server.init?rev=385029&r1=385028&r2=385029&view=diff
==============================================================================
--- directory/branches/daemon/1.0/plugin/src/main/resources/org/apache/directory/daemon/installers/izpack/server.init (original)
+++ directory/branches/daemon/1.0/plugin/src/main/resources/org/apache/directory/daemon/installers/izpack/server.init Fri Mar 10 23:25:25 2006
@@ -67,7 +67,7 @@
fi
if [ ! -d "$JAVA_HOME" ] ; then
- elif [ `uname` = Linux ] ; then
+ if [ `uname` = Linux ] ; then
for jdkhome in `find /usr/java/ -type d -regex '.*\/jdk1\.5\.....$' | sort`; do
JAVA_HOME=$jdkhome;
done
@@ -125,7 +125,7 @@
DAEMON_HOME=$SERVER_HOME/bin
CLASSPATH=$CLASSPATH:$DAEMON_HOME/bootstrapper.jar:$DAEMON_HOME/logger.jar:$DAEMON_HOME/daemon.jar
echo CLASSPATH=$CLASSPATH
-${app.caps}_USER=root
+${app.caps}_USER=$USER
TMP_DIR=$SERVER_HOME/var/tmp
PID_FILE=$SERVER_HOME/var/run/server.pid
@@ -164,7 +164,7 @@
failure $"${app} server start"
echo
if [ -d /var/lock/subsys ] ; then
- [ "$RETVAL" -eq 0 ] && touch /var/lock/subsys/${app}
+ [ "$RETVAL" -eq 0 ] && touch $SERVER_HOME/var/${app}.lock
fi
fi
@@ -195,7 +195,7 @@
failure $"${app} server shutdown"
echo
if [ -d /var/lock/subsys/${app} ] ; then
- [ "$RETVAL" -eq 0 ] && rm /var/lock/subsys/${app}
+ [ "$RETVAL" -eq 0 ] && rm $SERVER_HOME/var/${app}.lock
fi
fi
Modified: directory/branches/daemon/1.0/plugin/src/main/resources/org/apache/directory/daemon/installers/rpm/server.init
URL: http://svn.apache.org/viewcvs/directory/branches/daemon/1.0/plugin/src/main/resources/org/apache/directory/daemon/installers/rpm/server.init?rev=385029&r1=385028&r2=385029&view=diff
==============================================================================
--- directory/branches/daemon/1.0/plugin/src/main/resources/org/apache/directory/daemon/installers/rpm/server.init (original)
+++ directory/branches/daemon/1.0/plugin/src/main/resources/org/apache/directory/daemon/installers/rpm/server.init Fri Mar 10 23:25:25 2006
@@ -62,7 +62,7 @@
fi
if [ ! -d "$JAVA_HOME" ] ; then
- elif [ `uname` = Linux ] ; then
+ if [ `uname` = Linux ] ; then
for jdkhome in `find /usr/java/ -type d -regex '.*\/jdk1\.5\.....$' | sort`; do
JAVA_HOME=$jdkhome;
done
@@ -120,7 +120,7 @@
DAEMON_HOME=$SERVER_HOME/bin
CLASSPATH=$CLASSPATH:$DAEMON_HOME/bootstrapper.jar:$DAEMON_HOME/logger.jar:$DAEMON_HOME/daemon.jar
echo CLASSPATH=$CLASSPATH
-${app.caps}_USER=root
+${app.caps}_USER=$USER
TMP_DIR=$SERVER_HOME/var/tmp
PID_FILE=$SERVER_HOME/var/run/server.pid
@@ -159,7 +159,7 @@
failure $"${app} server start"
echo
if [ -d /var/lock/subsys ] ; then
- [ "$RETVAL" -eq 0 ] && touch /var/lock/subsys/${app}
+ [ "$RETVAL" -eq 0 ] && touch $SERVER_HOME/var/${app}.lock
fi
fi
@@ -190,7 +190,7 @@
failure $"${app} server shutdown"
echo
if [ -d /var/lock/subsys/${app} ] ; then
- [ "$RETVAL" -eq 0 ] && rm /var/lock/subsys/${app}
+ [ "$RETVAL" -eq 0 ] && rm $SERVER_HOME/var/${app}.lock
fi
fi