packages: synergy/synergy-server.init - do not use exit in xinitrc, use ret...

[glen]

Author: glen                         Date: Sun Jan 29 21:10:29 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- do not use exit in xinitrc, use return instead

---- Files affected:
packages/synergy:
   synergy-server.init (1.4 -> 1.5) 

---- Diffs:

================================================================
Index: packages/synergy/synergy-server.init
diff -u packages/synergy/synergy-server.init:1.4 packages/synergy/synergy-server.init:1.5
--- packages/synergy/synergy-server.init:1.4	Mon Jan 23 21:16:22 2012
+++ packages/synergy/synergy-server.init	Sun Jan 29 22:10:24 2012
@@ -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} &
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/synergy/synergy-server.init?r1=1.4&r2=1.5&f=u