SOURCES: prelude-manager.init - unified and fixed

[qboosh]

Author: qboosh                       Date: Mon Mar 24 18:08:05 2008 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- unified and fixed

---- Files affected:
SOURCES:
   prelude-manager.init (1.5 -> 1.6) 

---- Diffs:

================================================================
Index: SOURCES/prelude-manager.init
diff -u SOURCES/prelude-manager.init:1.5 SOURCES/prelude-manager.init:1.6
--- SOURCES/prelude-manager.init:1.5	Fri Jan  5 19:02:52 2007
+++ SOURCES/prelude-manager.init	Mon Mar 24 19:07:59 2008
@@ -9,60 +9,73 @@
 
 # Get service config
 if [ -f /etc/sysconfig/prelude-manager ]; then
-        . /etc/sysconfig/prelude-manager
+	. /etc/sysconfig/prelude-manager
 else
 	nls "Error: %s not found" /etc/sysconfig/prelude-manager
 	nls " Prelude Manager can't be run."
-        exit 1
+	exit 1
 fi
 
-
-
-case "$1" in
-    start)
-	    if [ ! -f /var/lock/subsys/prelude-manager ]; then
+start() {
+	if [ ! -f /var/lock/subsys/prelude-manager ]; then
 		msg_starting "Prelude Manager"
 		daemon prelude-manager -d
 		RETVAL=$?
 		[ $RETVAL -eq 0 ] && touch /var/lock/subsys/prelude-manager
-	    else
+	else
 		msg_already_running "Prelude Manager"
-	    fi
-	    ;;
+	fi
+}
 
-    stop)
-	    if [ -f /var/lock/subsys/prelude-manager ]; then
+stop() {
+	if [ -f /var/lock/subsys/prelude-manager ]; then
 		msg_stopping "Prelude Manager"
 		killproc prelude-manager
 		rm -f /var/lock/subsys/prelude-manager
-	    fi
-	    ;;
+	fi
+}
 
-    restart)
-	    $0 stop
-	    $0 start
-	    exit $?
-	    ;;
+condrestart() {
+	if [ -f /var/lock/subsys/prelude-manager ]; then
+		stop
+		start
+	else
+		msg_not_running prelude-manager
+		RETVAL=$1
+	fi
+}
 
-    reload|force-reload)
-	    if [ -f /var/lock/subsys/prelude-manager ]; then
+RETVAL=0
+case "$1" in
+  start)
+	start
+	;;
+  stop)
+	stop
+	;;
+  restart)
+	stop
+	start
+	;;
+  try-restart)
+	condrestart 0
+	;;
+  reload|force-reload)
+	if [ -f /var/lock/subsys/prelude-manager ]; then
 		msg_reloading "Prelude Manager"
 		killproc prelude-manager -HUP
 		RETVAL=$?
-	    else
+	else
 		msg_not_running prelude-manager >&2
 		exit 7
-	    fi
-	    ;;
-
-    status)
-	    status prelude-manager
-    ;;
-
-    *)
-    echo $"Usage: $0 {start|stop|reload|force-reload|status}"
-    exit 1
-
+	fi
+	;;
+  status)
+	status prelude-manager
+	;;
+  *)
+	msg_usage "$0 {start|stop|restart|try-restart|reload|force-reload|status}"
+	exit 3
 esac
 
-exit 0
+exit $RETVAL
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/prelude-manager.init?r1=1.5&r2=1.6&f=u