Author: glen Date: Sun Jan 29 21:09:23 2012 GMT
Module: packages Tag: HEAD
---- Log message:
- do not use exit in xinitrc, use return instead
---- Files affected:
packages/synergy:
synergy-client.init (1.4 -> 1.5)
---- Diffs:
================================================================
Index: packages/synergy/synergy-client.init
diff -u packages/synergy/synergy-client.init:1.4
packages/synergy/synergy-client.init:1.5
--- packages/synergy/synergy-client.init:1.4 Mon Jan 23 21:16:14 2012
+++ packages/synergy/synergy-client.init Sun Jan 29 22:09:18 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,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} &
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/synergy/synergy-client.init?r1=1.4&r2=1.5&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
