The branch, master has been updated via dc9aebf35fc177a18cb80d526872217f8c35b2f2 (commit) from fbca95097bd7536470365bd550932ed3af385517 (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 dc9aebf35fc177a18cb80d526872217f8c35b2f2 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Mon Apr 1 19:23:27 2013 +0200 fixing two syntax issues ----------------------------------------------------------------------- Summary of changes: debian/x2gothinclient.postrm | 2 +- x2gosmartcardrules/x2gognupgccid | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/debian/x2gothinclient.postrm b/debian/x2gothinclient.postrm index 70a170d..4a8284a 100755 --- a/debian/x2gothinclient.postrm +++ b/debian/x2gothinclient.postrm @@ -18,7 +18,7 @@ set -e case "$1" in purge) timer=0 - while ps ax | grep x2gothinclient | x2gothinclientd 1>/dev/null; do + while ps ax | grep x2gothinclient | grep x2gothinclientd 1>/dev/null; do sleep 1 timer=$(($timer+1)) if [ $timer -gt 20 ]; then diff --git a/x2gosmartcardrules/x2gognupgccid b/x2gosmartcardrules/x2gognupgccid index df3b229..9632baa 100755 --- a/x2gosmartcardrules/x2gognupgccid +++ b/x2gosmartcardrules/x2gognupgccid @@ -23,7 +23,7 @@ GROUP=scard set -e # only do this if x2gothinclientd is default display manager, otherwise this makes no sense -if ps ax | grep x2gothinclient | x2gothinclientd 1>/dev/null; then +if ps ax | grep x2gothinclient | grep x2gothinclientd 1>/dev/null; then DEV=`echo ${DEVICE} | sed 's/proc/dev/'` hooks/post-receive -- x2gothinclient.git (X2Go Thin Client Environment) 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 "x2gothinclient.git" (X2Go Thin Client Environment).