diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2007-10-10 17:39:41 +0100 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2007-10-10 17:39:41 +0100 |
| commit | 077fb290c57ee937330b22b2ae794fc9967d4722 (patch) | |
| tree | bf0bc225d70cfbda574a7b4b625b25408a155961 /tools/run-with-tmp-session-bus.sh | |
| parent | 8cff9309bf0502ea9147f81cb12d0e067f9ba862 (diff) | |
| parent | 1ca4b10e3000b0fe918537c20efa35ea1ffb5b26 (diff) | |
Merge branch 'master' of ssh://git.freedesktop.org/git/dbus/dbus
Diffstat (limited to 'tools/run-with-tmp-session-bus.sh')
| -rwxr-xr-x | tools/run-with-tmp-session-bus.sh | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/tools/run-with-tmp-session-bus.sh b/tools/run-with-tmp-session-bus.sh index c04e2385..fb1aff59 100755 --- a/tools/run-with-tmp-session-bus.sh +++ b/tools/run-with-tmp-session-bus.sh @@ -38,16 +38,19 @@ if ! test -e "$DBUS_TOP_BUILDDIR"/bus/dbus-daemon ; then die "$DBUS_TOP_BUILDDIR/bus/dbus-daemon does not exist" fi -export PATH="$DBUS_TOP_BUILDDIR"/bus:$PATH -## the libtool script found by the path search should already do this, but -export LD_LIBRARY_PATH=$DBUS_TOP_BUILDDIR/dbus/.libs:$LD_LIBRARY_PATH +PATH="$DBUS_TOP_BUILDDIR"/bus:$PATH +export PATH +## the libtool script found by the path search should already do this, but +LD_LIBRARY_PATH=$DBUS_TOP_BUILDDIR/dbus/.libs:$LD_LIBRARY_PATH +export LD_LIBRARY_PATH unset DBUS_SESSION_BUS_ADDRESS unset DBUS_SESSION_BUS_PID echo "Running $DBUS_TOP_BUILDDIR/tools/dbus-launch --sh-syntax --config-file=$CONFIG_FILE" >&2 -export DBUS_USE_TEST_BINARY=1 +DBUS_USE_TEST_BINARY=1 +export DBUS_USE_TEST_BINARY eval `$DBUS_TOP_BUILDDIR/tools/dbus-launch --sh-syntax --config-file=$CONFIG_FILE` if test -z "$DBUS_SESSION_BUS_PID" ; then |