- cleanup

[packages/crossfire.git] / crossfire.init

diff --git a/crossfire.init b/crossfire.init
index 4332859d0332389c065b932278eb052306b29c7d..89dca1ffd4f7bdc8e71270e34ed8ee50c6b9dc4c 100644 (file)
--- a/crossfire.init
+++ b/crossfire.init
@@ -1,7 +1,7 @@
 #!/bin/sh
 #
 # chkconfig:   345 98 03
-# description: Starts and stops the Crossfire server 
+# description: Starts and stops the Crossfire server
 #
 
 export PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/X11R6/bin
@@ -16,19 +16,24 @@ export PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/X11R6/bin
 . /etc/sysconfig/crossfire
 
 # Check that networking is up.
-if is_no "${NETWORKING}"; then
-        msg_Network_Down crossfire
-        exit 1
+if is_yes "${NETWORKING}"; then
+       if [ ! -f /var/lock/subsys/network -a "$1" != stop -a "$1" != status ]; then
+               msg_network_down crossfire
+               exit 1
+       fi
+else
+       exit 0
 fi
 
 TMPDIR="/tmp"; export TMPDIR
 
+RETVAL=0
 case "$1" in
-    start)
-        if [ ! -f /var/lock/subsys/crossfire ]; then
+  start)
+       if [ ! -f /var/lock/subsys/crossfire ]; then
                cd /
                FLAGS="-log /var/log/crossfire"
-               if [ -n "$PORT" ] ; then
+               if [ -n "$PORT" ]; then
                        FLAGS="$FLAGS -csport $PORT"
                fi
                if is_yes "$DEBUG" ; then
@@ -36,60 +41,46 @@ case "$1" in
                else
                        FLAGS="$FLAGS +d"
                fi
-               if is_yes "$STAT_LOSS_ON_DEATH" ; then
-                       FLAGS="$FLAGS -stat_loss_on_death"
-               else
-                       FLAGS="$FLAGS +stat_loss_on_death"
-               fi
-               if is_yes "$BALANCED_STAT_LOSS" ; then
-                       FLAGS="$FLAGS -balanced_stat_loss"
-               else
-                       FLAGS="$FLAGS +balanced_stat_loss"
-               fi
-               if is_yes "$USE_PERMANENT_EXPERIENCE" ; then
-                       FLAGS="$FLAGS -use_permanent_experience"
-               else
-                       FLAGS="$FLAGS +use_permanent_experience"
-               fi
-       
                msg_starting crossfire
-               daemon su games -c "\"exec crossfire -detach $FLAGS >>/var/log/crossfire 2>&1\"" 
+               daemon su games -c "\"exec crossfire -detach $FLAGS >>/var/log/crossfire 2>&1\""
                RETVAL=$?
                [ $RETVAL -eq 0 ] && touch /var/lock/subsys/crossfire
-        else
-                msg_Already_Running crossfire
-                exit 1
-        fi
+       else
+               msg_already_running crossfire
+       fi
        ;;
-    stop)
-        if [ -f /var/lock/subsys/crossfire ]; then
-                msg_stopping crossfire
+  stop)
+       if [ -f /var/lock/subsys/crossfire ]; then
+               msg_stopping crossfire
                killproc crossfire
                rm -f /var/lock/subsys/crossfire >/dev/null 2>&1
-        else
-                msg_Not_Running crossfire
-                exit 1
-        fi
+       else
+               msg_not_running crossfire
+       fi
        ;;
-   status)
-       status crossfire
+  status)
+       status crossfire
+       RETVAL=$?
        su games -c "crossfire +d -s"
-       exit $?
        ;;
   restart)
        $0 stop
        $0 start
+       RETVAL=$?
        ;;
-  reload)
+  reload|force-reload)
        if [ -f /var/lock/subsys/crossfire ]; then
-               msg_reloading crossfire
-               killproc crossfire
+               msg_reloading crossfire
+               killproc crossfire
+               RETVAL=$?
        else
-               msg_Not_Running crossfire
-               exit 1
-        fi
+               msg_not_running crossfire >&2
+               exit 7
+       fi
        ;;
   *)
-       msg_Usage "$0 {start|stop|restart|reload|status}"
-       exit 1
+       msg_usage "$0 {start|stop|restart|reload|force-reload|status}"
+       exit 3
 esac
+
+exit $RETVAL