- do not use exit in xinitrc, use return instead

Changed files:
    synergy-client.init -> 1.5
    synergy-server.init -> 1.5

diff --git a/synergy-client.init b/synergy-client.init
index feb8ac7c449717c69411e468c8e6ba0ae71f9972..08c66d59464ee9c4d81923ec2d6a33328f506fc3 100644 (file)
--- a/synergy-client.init
+++ b/synergy-client.init
@@ -1,7 +1,20 @@
 #!/bin/sh
 
-# Source function library
-. /etc/rc.d/init.d/functions
+# is_yes taken from rc-scripts
+is_yes()
+{
+       # Check value
+       case "$1" in
+         yes|Yes|YES|true|True|TRUE|on|On|ON|Y|y|1)
+               # true returns zero
+               return 0
+               ;;
+         *)
+               # false returns one
+               return 1
+               ;;
+       esac
+}
 
 # Get network config
 . /etc/sysconfig/network
@@ -12,18 +25,21 @@
 # Check that networking is up.
 if ! is_yes "${NETWORKING}"; then
        echo >&2 "$0: Networking disabled"
-       exit 3
+       return 3
 fi
 
 if [ -z "$SYNERGY_SERVER" ]; then
        echo >&2 "$0: SYNERGY_SERVER not set. Please update /etc/synergy/client.conf"
-       exit 1
+       return 1
 fi
 
 SYNERGYC_NAME=${SYNERGYC_NAME:-$(hostname -s)}
 
-killall -TERM synergyc 2> /dev/null
-usleep 300
-killall -9 synergyc 2> /dev/null
+pids=$(pgrep -u $USER synergyc)
+if [ -n "$pids" ]; then
+       kill -TERM $pids
+       usleep 300
+       kill -9 $pids
+fi
 
-exec /usr/bin/synergyc --daemon --restart -n ${SYNERGYC_NAME} ${SYNERGY_SERVER}
+synergyc --daemon --restart -n ${SYNERGYC_NAME} ${SYNERGY_SERVER} &

diff --git a/synergy-server.init b/synergy-server.init
index b1eab5a2e38a4a52deb4de839146b3443bdfe114..3a76ba38767b12f34fe20693c55c34704b68b115 100644 (file)
--- a/synergy-server.init
+++ b/synergy-server.init
@@ -1,7 +1,20 @@
 #!/bin/sh
 
-# Source function library
-. /etc/rc.d/init.d/functions
+# is_yes taken from rc-scripts
+is_yes()
+{
+       # Check value
+       case "$1" in
+         yes|Yes|YES|true|True|TRUE|on|On|ON|Y|y|1)
+               # true returns zero
+               return 0
+               ;;
+         *)
+               # false returns one
+               return 1
+               ;;
+       esac
+}
 
 # Get network config
 . /etc/sysconfig/network
@@ -12,15 +25,18 @@
 # Check that networking is up.
 if ! is_yes "${NETWORKING}"; then
        echo >&2 "$0: Networking disabled"
-       exit 3
+       return 3
 fi
 
 SYNERGYS_NAME=${SYNERGYS_NAME:-$(hostname -s)}
 
 [ -n "$SYNERGYS_ADDRESS" ] && SYNERGYS_OPTS="$SYNERGYS_OPTS --address $SYNERGYS_ADDRESS"
 
-killall -TERM synergys 2> /dev/null
-usleep 300
-killall -9 synergys 2> /dev/null
+pids=$(pgrep -u $USER synergys)
+if [ -n "$pids" ]; then
+       kill -TERM $pids
+       usleep 300
+       kill -9 $pids
+fi
 
-exec /usr/bin/synergys --daemon --restart -n ${SYNERGYS_NAME} --config /etc/synergy/layout.conf ${SYNERGYS_OPTS}
+synergys --daemon --restart -n ${SYNERGYS_NAME} --config /etc/synergy/layout.conf ${SYNERGYS_OPTS} &