Attachment 11955 Details for Bug 9280 – updated patch

[patch] updated patch

rwtsb-remove-bashism.diff (text/plain), 1.40 KB, created by Simon McVittie on 2007-10-09 05:03:43 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Simon McVittie

Created: 2007-10-09 05:03:43 UTC

Size: 1.40 KB

patch

obsolete

>diff --git a/ChangeLog b/ChangeLog
>index fe3af99..8122055 100644
>--- a/ChangeLog
>+++ b/ChangeLog
>@@ -1,3 +1,8 @@
>+2007-10-09  Simon McVittie  <simon.mcvittie@collabora.co.uk>
>+
>+	* tools/run-with-tmp-session-bus.sh: replace "export FOO=bar" with
>+	POSIXly correct "FOO=bar; export FOO" (#9280)
>+
> 2007-09-20  Ryan Lortie  <desrt@desrt.ca>
> 
> 	Add argument path matching support.  Bug #11066.
>diff --git a/tools/run-with-tmp-session-bus.sh b/tools/run-with-tmp-session-bus.sh
>index c04e238..eeac51a 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
>+PATH="$DBUS_TOP_BUILDDIR"/bus:$PATH
>+export 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
>+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

Actions: View | Splinter Review

Attachments on bug 9280: 11955

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.