[X2go-Commits] x2godesktopsharing.git - master (branch) updated: 3.0.1.2-26-g7d7533a
X2go dev team
git-admin at x2go.org
Thu Sep 29 08:07:48 CEST 2011
The branch, master has been updated
via 7d7533aa07b347e105a6b02557d7732183579a48 (commit)
from 4802e527534545c7ecb17d977d193e5cc246d57d (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 7d7533aa07b347e105a6b02557d7732183579a48
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date: Thu Sep 29 08:07:46 2011 +0200
be more precise with display port grepping
-----------------------------------------------------------------------
Summary of changes:
bin/x2godesktopsharing-terminate | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
The diff of changes is:
diff --git a/bin/x2godesktopsharing-terminate b/bin/x2godesktopsharing-terminate
index 9fa3e6c..bbf7675 100755
--- a/bin/x2godesktopsharing-terminate
+++ b/bin/x2godesktopsharing-terminate
@@ -37,10 +37,10 @@ for process_id in `pidof x2godesktopsharing`; do
env_of_process=$(cat -A /proc/$process_id/environ)
env_of_process=${env_of_process//^@/\\n}
display=$(echo -e $env_of_process | egrep "^DISPLAY=.*$" | cut -d"=" -f2)
- if echo $display | grep $X2GO_DISPLAY &>/dev/null; then
+ if echo $display | grep ":$X2GO_DISPLAY" &>/dev/null; then
kill -SIGTERM $process_id
exit 0
fi
done
-exit -1
\ No newline at end of file
+exit -1
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