--- plugin/src/main/resources/org/apache/directory/daemon/installers/rpm/server.init.orig	2006-09-29 14:22:08.000000000 +0200
+++ plugin/src/main/resources/org/apache/directory/daemon/installers/rpm/server.init	2006-09-29 15:49:13.000000000 +0200
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 #
 # chkconfig: 345 91 35
 # description: Starts and stops ${app} server. 
@@ -10,11 +10,6 @@
 DISPLAY=:0.0
 export DISPLAY
 
-# Source function library.
-if [ -f /etc/init.d/functions ] ; then
-     . /etc/init.d/functions
-fi
-
 # Source networking configuration.
 if [ -f /etc/sysconfig/network ] ; then
      . /etc/sysconfig/network
@@ -125,6 +120,20 @@
 
 cd $SERVER_HOME
 
+# Source function library.
+if [ -f /lib/lsb/init-functions ] ; then
+     . /lib/lsb/init-functions
+else
+    if [ ${darwin} = "true" ] ;
+	alias log_success_message="echo -n successful" 
+	alias log_failure_message="echo -n failed"
+    else 
+	alias log_success_message="echo -n success" 
+	alias log_failure_message="echo -n failure" 
+    fi
+fi
+
+
 case "$1" in
   start)
     #
@@ -147,22 +156,15 @@
     org.apache.directory.daemon.JsvcBootstrapper \
     $_${app.caps}_HOME start
 
-    if [ `uname` = "Darwin" ] ; then
-        [ "$RETVAL" -eq 0 ] && echo successful ${app} server startup || \
-             echo failed ${app} server start
-    elif [ `uname` = "SunOS" ] ; then
-        [ "$RETVAL" -eq 0 ] && echo success ${app} server startup || \
-             echo failure ${app} server start
+    if [ "$RETVAL" -eq 0 ] ; then
+	touch $SERVER_HOME/var/${app}.lock
+	log_success_msg ${app} server startup
     else
-        [ "$RETVAL" -eq 0 ] && success $"${app} server startup" || \
-             failure $"${app} server start"
-        echo
-        if [ -d /var/lock/subsys ] ; then
-               [ "$RETVAL" -eq 0 ] && touch $SERVER_HOME/var/${app}.lock
-        fi
+	log_failure_msg ${app} server startup
     fi
+    echo
 
-    exit $?
+    exit $RETVAL
     ;;
 
   stop)
@@ -178,22 +180,15 @@
     -Dlog4j.configuration=file://$SERVER_HOME/conf/log4j.properties\
     org.apache.directory.daemon.JsvcBootstrapper stop
 
-    if [ `uname` = "Darwin" ] ; then
-        [ "$RETVAL" -eq 0 ] && echo successful ${app} server shutdown || \
-             echo failed ${app} server shutdown
-    elif [ `uname` = "SunOS" ] ; then
-        [ "$RETVAL" -eq 0 ] && echo success ${app} server shutdown || \
-             echo failure ${app} server shutdown
+    if [ "$RETVAL" -eq 0 ] ; then
+	rm -f $SERVER_HOME/var/${app}.lock
+	log_success_msg ${app} server shutdown
     else
-        [ "$RETVAL" -eq 0 ] && success $"${app} server shutdown" || \
-             failure $"${app} server shutdown"
-        echo
-        if [ -d /var/lock/subsys/${app} ] ; then
-               [ "$RETVAL" -eq 0 ] && rm $SERVER_HOME/var/${app}.lock
-        fi
+	log_failure_msg ${app} server shutdown
     fi
+    echo
 
-    exit $?
+    exit $RETVAL
     ;;
 
   debug)