[prev in list] [next in list] [prev in thread] [next in thread] 

List:       freedesktop-dbus
Subject:    [PATCH] Quoting fix for test suite when dash is /bin/sh
From:       Scott James Remnant <scott () netsplit ! com>
Date:       2008-07-18 13:32:50
Message-ID: 20080718133249.GA8404 () bioshock ! vm ! bytemark ! co ! uk
[Download RAW message or body]

* tools/run-with-tmp-session-bus.sh: Quote the escaped service
  directory variable before passing to sed, otherwise dash will
  remove the extra backslashes anyway (which it's entitled to do)
---
 tools/run-with-tmp-session-bus.sh |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/tools/run-with-tmp-session-bus.sh b/tools/run-with-tmp-session-bus.sh
index fb1aff5..e900743 100755
--- a/tools/run-with-tmp-session-bus.sh
+++ b/tools/run-with-tmp-session-bus.sh
@@ -28,7 +28,7 @@ echo "escaped service dir is: $ESCAPED_SERVICE_DIR" >&2
 
 ## create a configuration file based on the standard session.conf
 cat $DBUS_TOP_BUILDDIR/bus/session.conf |  \
-    sed -e 's/<standard_session_servicedirs.*$/<servicedir>'$ESCAPED_SERVICE_DIR'<\/servicedir>/g' \
|  \ +    sed -e 's/<standard_session_servicedirs.*$/<servicedir>'"$ESCAPED_SERVICE_DIR"'<\/servicedir>/g' \
|  \  sed -e 's/<include.*$//g'                \
   > $CONFIG_FILE
 
-- 
1.5.4.3

_______________________________________________
dbus mailing list
dbus@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dbus


[prev in list] [next in list] [prev in thread] [next in thread]