aboutsummaryrefslogtreecommitdiffstats
path: root/tools/with-session-bus.sh
diff options
context:
space:
mode:
authorEmilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>2011-02-01 21:47:58 +0800
committerEmilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>2011-03-24 04:52:21 +0800
commit97167291ee0e9436dd9282d0d8d673f6ed2d10cf (patch)
treed080dce966735abcaee3bc6b9319a693bd00d28f /tools/with-session-bus.sh
parent2bddc2dae8b00f034164096d7a981015d8690cf7 (diff)
downloadgsoc2013-empathy-97167291ee0e9436dd9282d0d8d673f6ed2d10cf.tar
gsoc2013-empathy-97167291ee0e9436dd9282d0d8d673f6ed2d10cf.tar.gz
gsoc2013-empathy-97167291ee0e9436dd9282d0d8d673f6ed2d10cf.tar.bz2
gsoc2013-empathy-97167291ee0e9436dd9282d0d8d673f6ed2d10cf.tar.lz
gsoc2013-empathy-97167291ee0e9436dd9282d0d8d673f6ed2d10cf.tar.xz
gsoc2013-empathy-97167291ee0e9436dd9282d0d8d673f6ed2d10cf.tar.zst
gsoc2013-empathy-97167291ee0e9436dd9282d0d8d673f6ed2d10cf.zip
Update tools from telepathy-glib
Diffstat (limited to 'tools/with-session-bus.sh')
-rw-r--r--tools/with-session-bus.sh10
1 files changed, 7 insertions, 3 deletions
diff --git a/tools/with-session-bus.sh b/tools/with-session-bus.sh
index 063bd7e17..cfedb5b9d 100644
--- a/tools/with-session-bus.sh
+++ b/tools/with-session-bus.sh
@@ -59,7 +59,9 @@ cleanup ()
{
pid=`head -n1 $me-$$.pid`
if test -n "$pid" ; then
- echo "Killing temporary bus daemon: $pid" >&2
+ if [ -n "$VERBOSE_TESTS" ]; then
+ echo "Killing temporary bus daemon: $pid" >&2
+ fi
kill -INT "$pid"
fi
rm -f $me-$$.address
@@ -69,8 +71,10 @@ cleanup ()
trap cleanup INT HUP TERM
dbus-daemon $dbus_daemon_args
-{ echo -n "Temporary bus daemon is "; cat $me-$$.address; } >&2
-{ echo -n "Temporary bus daemon PID is "; head -n1 $me-$$.pid; } >&2
+if [ -n "$VERBOSE_TESTS" ]; then
+ { echo -n "Temporary bus daemon is "; cat $me-$$.address; } >&2
+ { echo -n "Temporary bus daemon PID is "; head -n1 $me-$$.pid; } >&2
+fi
e=0
DBUS_SESSION_BUS_ADDRESS="`cat $me-$$.address`"