[X2Go-Commits] x2godesktopsharing.git - master (branch) updated: 3.1.1.0-24-g0466cb3

X2Go dev team git-admin at x2go.org
Wed Dec 18 11:42:43 CET 2013


The branch, master has been updated
       via  0466cb31920b6d5925a2721edc1bdf4c1a293478 (commit)
      from  b06196d55c25a7e3b9cfa9ab21a67b9f4e35eec9 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 0466cb31920b6d5925a2721edc1bdf4c1a293478
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Wed Dec 18 11:42:35 2013 +0100

    improvement for last commit

-----------------------------------------------------------------------

Summary of changes:
 bin/x2goterminate-desktopsharing |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

The diff of changes is:
diff --git a/bin/x2goterminate-desktopsharing b/bin/x2goterminate-desktopsharing
index 7792582..2c5c8e4 100755
--- a/bin/x2goterminate-desktopsharing
+++ b/bin/x2goterminate-desktopsharing
@@ -31,10 +31,12 @@ X2GO_LIB_PATH=`x2gopath libexec`
 
 if type -p pidof 1>/dev/null 2>/dev/null; then
     PIDOF=pidof
-elif [ -x /sbin/pidof ]; then
-    PIDOF=/sbin/pidof
+elif [ -x /usr/local/sbin/pidof ]; then
+    PIDOF=/usr/local/sbin/pidof
 elif [ -x /usr/sbin/pidof ]; then
     PIDOF=/usr/sbin/pidof
+elif [ -x /sbin/pidof ]; then
+    PIDOF=/sbin/pidof
 else
 	# no pidof utility found, get out the big hammer!!!
 	killall x2godesktopsharing


hooks/post-receive
-- 
x2godesktopsharing.git (Desktop Sharing for X2Go)

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "x2godesktopsharing.git" (Desktop Sharing for X2Go).




More information about the x2go-commits mailing list