diff options
| author | Rob Taylor <rob.taylor@collabora.co.uk> | 2006-08-24 23:27:58 +0100 |
|---|---|---|
| committer | Rob Taylor <rob.taylor@collabora.co.uk> | 2006-08-24 23:27:58 +0100 |
| commit | 99e10857c50a025fb37613c4dae720b5afc890f5 (patch) | |
| tree | c13d42c4bb72b702e876b172a87a477f869e938b /tools | |
| parent | b193f2b28472790ff66fc575d55d4e6d5a9d3e78 (diff) | |
| parent | 22ea91b33bff95cf480a4c992e4774b671f1534b (diff) | |
| download | dbus-glib-99e10857c50a025fb37613c4dae720b5afc890f5.tar.gz | |
Merge http://ms800.montefiore.ulg.ac.be/~frecinau/dbus-glib
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/run-with-tmp-session-bus.sh | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/tools/run-with-tmp-session-bus.sh b/tools/run-with-tmp-session-bus.sh index c68b722..558ecf0 100755 --- a/tools/run-with-tmp-session-bus.sh +++ b/tools/run-with-tmp-session-bus.sh @@ -17,6 +17,9 @@ function die() if test -z "$DBUS_TOP_BUILDDIR" ; then die "Must set DBUS_TOP_BUILDDIR" fi +if test -z "$DBUS_TOP_SRCDIR" ; then + die "Must set DBUS_TOP_SRCDIR" +fi ## convenient to be able to ctrl+C without leaking the message bus process trap 'die "Received SIGINT"' SIGINT @@ -27,7 +30,7 @@ ESCAPED_SERVICE_DIR=`echo $SERVICE_DIR | sed -e 's/\//\\\\\\//g'` echo "escaped service dir is: $ESCAPED_SERVICE_DIR" >&2 ## create a configuration file based on the standard session.conf -cat $DBUS_TOP_BUILDDIR/tools/session.conf | \ +cat $DBUS_TOP_SRCDIR/tools/session.conf | \ sed -e 's/<servicedir>.*$/<servicedir>'$ESCAPED_SERVICE_DIR'<\/servicedir>/g' | \ sed -e 's/<include.*$//g' \ > $CONFIG_FILE |