- updated init scripts (added try-restart, adjusted force-reload exit codes wrt....

diff --git a/FreeWnn-cWnn.init b/FreeWnn-cWnn.init
index 2ae67d0ed425255e9fd2d34922c9061af40c998b..91e8458291d37d67382c40f4e6070f2d0b5259a8 100644 (file)
--- a/FreeWnn-cWnn.init
+++ b/FreeWnn-cWnn.init
@@ -31,10 +31,7 @@ if [ -f /etc/FreeWnn/zh_CN/cserverrc ]; then
        exit 6
 fi
 
-RETVAL=0
-# See how we were called.
-case "$1" in
-  start)
+start() {
        if [ ! -f /var/lock/subsys/cWnn ]; then
                msg_starting cWnn
                rm -f /tmp/jd_sockV4
@@ -45,28 +42,53 @@ case "$1" in
        else
                msg_already_running cWnn
        fi
-       ;;
-  stop)
+}
+
+stop() {
        if [ -f /var/lock/subsys/cWnn ]; then
                msg_stopping cWnn
                killproc cserver
                rm -f /var/lock/subsys/cWnn /tmp/jd_sockV4
-               exit $RETVAL
        else
                msg_not_running cWnn
        fi
+}
+
+condrestart() {
+       if [ ! -f /var/lock/subsys/cWnn ]; then
+               msg_not_running cWnn
+               RETVAL=$1
+               return
+       fi
+       stop
+       start
+}
+
+RETVAL=0
+# See how we were called.
+case "$1" in
+  start)
+       start
+       ;;
+  stop)
+       stop
        ;;
   status)
        status cserver
-       exit $?
+       RETVAL=$?
+       ;;
+  restart)
+       stop
+       start
+       ;;
+  try-restart)
+       condrestart 0
        ;;
-  restart|force-reload)
-       $0 stop
-       $0 start
-       exit $?
+  force-reload)
+       condrestart 7
        ;;
   *)
-       msg_usage "$0 {start|stop|restart|force-reload|status}"
+       msg_usage "$0 {start|stop|restart|try-restart|force-reload|status}"
        exit 3
        ;;
 esac

diff --git a/FreeWnn-kWnn.init b/FreeWnn-kWnn.init
index afa6945bd726e68845c8410ad148957a212aa696..0de5cc72fe88ab6b694173a2778b579b832da9b2 100644 (file)
--- a/FreeWnn-kWnn.init
+++ b/FreeWnn-kWnn.init
@@ -31,10 +31,7 @@ if [ -f /etc/FreeWnn/ko_KR/kserverrc ]; then
        exit 6
 fi
 
-RETVAL=0
-# See how we were called.
-case "$1" in
-    start)
+start() {
        if [ ! -f /var/lock/subsys/kWnn ]; then
                msg_starting kWnn
                rm -f /tmp/jd_sockV4
@@ -45,8 +42,9 @@ case "$1" in
        else
                msg_already_running kWnn
        fi
-       ;;
-    stop)
+}
+
+stop() {
        if [ -f /var/lock/subsys/kWnn ]; then
                msg_stopping kWnn
                killproc kserver
@@ -54,18 +52,43 @@ case "$1" in
        else
                msg_not_running kWnn
        fi
+}
+
+condrestart() {
+       if [ ! -f /var/lock/subsys/kWnn ]; then
+               msg_not_running kWnn
+               RETVAL=$1
+               return
+       fi
+       stop
+       start
+}
+
+RETVAL=0
+# See how we were called.
+case "$1" in
+  start)
+       start
+       ;;
+  stop)
+       stop
        ;;
-    status)
+  status)
        status kserver
-       exit $?
+       RETVAL=$?
+       ;;
+  restart)
+       stop
+       start
+       ;;
+  try-restart)
+       condrestart 0
        ;;
-    restart|force-reload)
-       $0 stop
-       $0 start
-       exit $?
+  force-reload)
+       condrestart 7
        ;;
-    *)
-       msg_usage "$0 {start|stop|restart|force-reload|status}"
+  *)
+       msg_usage "$0 {start|stop|restart|try-restart|force-reload|status}"
        exit 3
        ;;
 esac

diff --git a/FreeWnn-tWnn.init b/FreeWnn-tWnn.init
index 02841a29a333ca1dd595f8b914049748c21194ea..69bf9c69ec334308e2ba5fc2f1db0ec2883140e6 100644 (file)
--- a/FreeWnn-tWnn.init
+++ b/FreeWnn-tWnn.init
@@ -31,10 +31,7 @@ if [ -f /etc/FreeWnn/zh_TW/tserverrc ]; then
        exit 6
 fi
 
-RETVAL=0
-# See how we were called.
-case "$1" in
-  start)
+start() {
        if [ ! -f /var/lock/subsys/tWnn ]; then
                msg_starting tWnn
                rm -f /tmp/jd_sockV4
@@ -45,8 +42,9 @@ case "$1" in
        else
                msg_already_running tWnn
        fi
-       ;;
-  stop)
+}
+
+stop() {
        if [ -f /var/lock/subsys/tWnn ]; then
                msg_stopping tWnn
                killproc tserver
@@ -54,18 +52,43 @@ case "$1" in
        else
                msg_not_running tWnn
        fi
+}
+
+condrestart() {
+       if [ ! -f /var/lock/subsys/tWnn ]; then
+               msg_not_running tWnn
+               RETVAL=$1
+               return
+       fi
+       stop
+       start
+}
+
+RETVAL=0
+# See how we were called.
+case "$1" in
+  start)
+       start
+       ;;
+  stop)
+       stop
        ;;
   status)
        status tserver
-       exit $?
+       RETVAL=$?
+       ;;
+  restart)
+       stop
+       start
+       ;;
+  try-restart)
+       condrestart 0
        ;;
-  restart|force-reload)
-       $0 stop
-       $0 start
-       exit $?
+  force-reload)
+       condrestart 7
        ;;
   *)
-       msg_usage "$0 {start|stop|restart|force-reload|status}"
+       msg_usage "$0 {start|stop|restart|try-restart|force-reload|status}"
        exit 3
        ;;
 esac

diff --git a/FreeWnn.init b/FreeWnn.init
index 400c21bc66b037b396a4c438b93f54bdf9bdeee9..a76a56c1f86ef05cb6761e4ed12c92625a082621 100644 (file)
--- a/FreeWnn.init
+++ b/FreeWnn.init
@@ -32,10 +32,7 @@ if [ -f /etc/FreeWnn/ja/jserverrc ]; then
        exit 6
 fi
 
-RETVAL=0
-# See how we were called.
-case "$1" in
-    start)
+start() {
        if [ ! -f /var/lock/subsys/FreeWnn ]; then
                msg_starting FreeWnn
                rm -f /tmp/jd_sockV4
@@ -46,8 +43,9 @@ case "$1" in
        else
                msg_already_running FreeWnn
        fi
-       ;;
-    stop)
+}
+
+stop() {
        if [ -f /var/lock/subsys/FreeWnn ]; then
                msg_stopping FreeWnn
                killproc jserver
@@ -55,18 +53,43 @@ case "$1" in
        else
                msg_not_running FreeWnn
        fi
+}
+
+condrestart() {
+       if [ ! -f /var/lock/subsys/FreeWnn ]; then
+               msg_not_running FreeWnn
+               RETVAL=$1
+               return
+       fi
+       stop
+       start
+}
+
+RETVAL=0
+# See how we were called.
+case "$1" in
+  start)
+       start
+       ;;
+  stop)
+       stop
        ;;
-    status)
+  status)
        status jserver
-       exit $?
+       RETVAL=$?
+       ;;
+  restart)
+       stop
+       start
+       ;;
+  try-restart)
+       condrestart 0
        ;;
-    restart|force-reload)
-       $0 stop
-       $0 start
-       exit $?
+  force-reload)
+       condrestart 7
        ;;
-    *)
-       msg_usage "$0 {start|stop|restart|force-reload|status}"
+  *)
+       msg_usage "$0 {start|stop|restart|try-restart|force-reload|status}"
        exit 3
        ;;
 esac