From 29fae4fdfd02cc2dd4c896a2cb271d9a3597623c Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Tue, 24 Apr 2007 12:27:18 +0100 Subject: [PATCH] test/run-with-tmp-session-bus.sh: untabify, remove trailing whitespace --- test/run-with-tmp-session-bus.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/test/run-with-tmp-session-bus.sh b/test/run-with-tmp-session-bus.sh index d03569f..948099d 100755 --- a/test/run-with-tmp-session-bus.sh +++ b/test/run-with-tmp-session-bus.sh @@ -4,7 +4,7 @@ SCRIPTNAME=$0 WRAPPED_SCRIPT=$1 shift -function die() +function die() { if ! test -z "$DBUS_SESSION_BUS_PID" ; then echo "killing message bus $DBUS_SESSION_BUS_PID" >&2 @@ -40,12 +40,12 @@ echo "Running: $WRAPPED_SCRIPT $*" >&2 "$WRAPPED_SCRIPT" "$@" || die "script \"$WRAPPED_SCRIPT\" failed" kill -TERM "$DBUS_SESSION_BUS_PID" \ - || die "Message bus vanished! should not have happened" \ - && echo "Killed daemon $DBUS_SESSION_BUS_PID" >&2 + || die "Message bus vanished! should not have happened" \ + && echo "Killed daemon $DBUS_SESSION_BUS_PID" >&2 sleep 2 -## be sure it really died +## be sure it really died kill -9 $DBUS_SESSION_BUS_PID > /dev/null 2>&1 || true exit 0 -- 2.11.4.GIT