Author: jodogne-guest
Date: 2015-03-04 15:56:37 +0000 (Wed, 04 Mar 2015)
New Revision: 18907

Modified:
   trunk/packages/orthanc/trunk/debian/orthanc-sqlite.orthanc.init
Log:
fix init script

Modified: trunk/packages/orthanc/trunk/debian/orthanc-sqlite.orthanc.init
===================================================================
--- trunk/packages/orthanc/trunk/debian/orthanc-sqlite.orthanc.init     
2015-03-04 15:33:08 UTC (rev 18906)
+++ trunk/packages/orthanc/trunk/debian/orthanc-sqlite.orthanc.init     
2015-03-04 15:56:37 UTC (rev 18907)
@@ -28,9 +28,6 @@
 SCRIPTNAME=/etc/init.d/orthanc
 ORTHANC_USER=orthanc:orthanc
 
-# Exit if the package is not installed
-[ -x "$DAEMON" ] || exit 0
-
 # Load the VERBOSE setting and other rcS variables
 . /lib/init/vars.sh
 
@@ -47,21 +44,20 @@
     mkdir -p $LOGDIR
     chown $ORTHANC_USER $LOGDIR
 
-       # Return
-       #   0 if daemon has been started
-       #   1 if daemon was already running
-       #   2 if daemon could not be started
+    # Return
+    #   0 if daemon has been started
+    #   1 if daemon was already running
+    #   2 if daemon could not be started
 
     start-stop-daemon --start --quiet --pidfile $PIDFILE --chuid $ORTHANC_USER 
--background --exec $DAEMON --test > /dev/null \
        || return 1
 
-    start-stop-daemon --start --quiet --make-pidfile --pidfile $PIDFILE 
--chuid $ORTHANC_USER --background --exec $DAEMON -- \
-       $DAEMON_ARGS \
+    start-stop-daemon --start --quiet --make-pidfile --pidfile $PIDFILE 
--chuid $ORTHANC_USER --background --exec $DAEMON -- $DAEMON_ARGS \
        || return 2
 
-       # Add code here, if necessary, that waits for the process to be ready
-       # to handle requests from services started subsequently which depend
-       # on this one.  As a last resort, sleep for some time.
+    # Add code here, if necessary, that waits for the process to be ready
+    # to handle requests from services started subsequently which depend
+    # on this one.  As a last resort, sleep for some time.
 }
 
 #
@@ -69,92 +65,93 @@
 #
 do_stop()
 {
-       # Return
-       #   0 if daemon has been stopped
-       #   1 if daemon was already stopped
-       #   2 if daemon could not be stopped
-       #   other if a failure occurred
-       start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --pidfile 
$PIDFILE --chuid $ORTHANC_USER --name $NAME
-       RETVAL="$?"
-       [ "$RETVAL" = 2 ] && return 2
-       # Wait for children to finish too if this is a daemon that forks
-       # and if the daemon is only ever run from this initscript.
-       # If the above conditions are not satisfied then add some other code
-       # that waits for the process to drop all resources that could be
-       # needed by services started subsequently.  A last resort is to
-       # sleep for some time.
-       start-stop-daemon --stop --quiet --oknodo --retry=0/1/KILL/5 --chuid 
$ORTHANC_USER --exec $DAEMON
-       [ "$?" = 2 ] && return 2
-       # Many daemons don't delete their pidfiles when they exit.
-       rm -f $PIDFILE
-       return "$RETVAL"
+    # Return
+    #   0 if daemon has been stopped
+    #   1 if daemon was already stopped
+    #   2 if daemon could not be stopped
+    #   other if a failure occurred
+    start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --pidfile $PIDFILE 
--chuid $ORTHANC_USER --name $NAME
+    RETVAL="$?"
+    [ "$RETVAL" = 2 ] && return 2
+
+    # Wait for children to finish too if this is a daemon that forks
+    # and if the daemon is only ever run from this initscript.
+    # If the above conditions are not satisfied then add some other code
+    # that waits for the process to drop all resources that could be
+    # needed by services started subsequently.  A last resort is to
+    # sleep for some time.
+    start-stop-daemon --stop --quiet --oknodo --retry=0/1/KILL/5 --chuid 
$ORTHANC_USER --exec $DAEMON
+    [ "$?" = 2 ] && return 2
+    # Many daemons don't delete their pidfiles when they exit.
+    rm -f $PIDFILE
+    return "$RETVAL"
 }
 
 #
 # Function that sends a SIGHUP to the daemon/service
 #
 do_reload() {
-       #
-       # If the daemon can reload its configuration without
-       # restarting (for example, when it is sent a SIGHUP),
-       # then implement that here.
-       #
-       start-stop-daemon --stop --signal 1 --quiet --pidfile $PIDFILE --chuid 
$ORTHANC_USER --name $NAME
-       return 0
+    #
+    # If the daemon can reload its configuration without
+    # restarting (for example, when it is sent a SIGHUP),
+    # then implement that here.
+    #
+    start-stop-daemon --stop --signal 1 --quiet --pidfile $PIDFILE --chuid 
$ORTHANC_USER --name $NAME
+    return 0
 }
 
 case "$1" in
-  start)
+    start)
        [ "$VERBOSE" != no ] && log_daemon_msg "Starting $DESC" "$NAME"
        do_start
        case "$?" in
-               0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;;
-               2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
+           0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;;
+           2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
        esac
        ;;
-  stop)
+    stop)
        [ "$VERBOSE" != no ] && log_daemon_msg "Stopping $DESC" "$NAME"
        do_stop
        case "$?" in
-               0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;;
-               2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
+           0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;;
+           2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
        esac
        ;;
-  status)
-       status_of_proc "$DAEMON" "$NAME" && exit 0 || exit $?
-       ;;
-  #reload|force-reload)
+    status)
+       status_of_proc "$DAEMON" "$NAME" && exit 0 || exit $?
+       ;;
+    #reload|force-reload)
+    #
+    # If do_reload() is not implemented then leave this commented out
+    # and leave 'force-reload' as an alias for 'restart'.
+    #
+    #log_daemon_msg "Reloading $DESC" "$NAME"
+    #do_reload
+    #log_end_msg $?
+    #;;
+    restart|force-reload)
        #
-       # If do_reload() is not implemented then leave this commented out
-       # and leave 'force-reload' as an alias for 'restart'.
-       #
-       #log_daemon_msg "Reloading $DESC" "$NAME"
-       #do_reload
-       #log_end_msg $?
-       #;;
-  restart|force-reload)
-       #
        # If the "reload" option is implemented then remove the
        # 'force-reload' alias
        #
        log_daemon_msg "Restarting $DESC" "$NAME"
        do_stop
        case "$?" in
-         0|1)
+           0|1)
                do_start
                case "$?" in
-                       0) log_end_msg 0 ;;
-                       1) log_end_msg 1 ;; # Old process is still running
-                       *) log_end_msg 1 ;; # Failed to start
+                   0) log_end_msg 0 ;;
+                   1) log_end_msg 1 ;; # Old process is still running
+                   *) log_end_msg 1 ;; # Failed to start
                esac
                ;;
-         *)
+           *)
                # Failed to stop
                log_end_msg 1
                ;;
        esac
        ;;
-  *)
+    *)
        #echo "Usage: $SCRIPTNAME {start|stop|restart|reload|force-reload}" >&2
        echo "Usage: $SCRIPTNAME {start|stop|status|restart|force-reload}" >&2
        exit 3


_______________________________________________
debian-med-commit mailing list
[email protected]
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit

Reply via email to