* tools/run-with-tmp-session-bus.sh:

* test/name-test/run-test.sh:
  Remove bashisms (patch from Julio M. Merino Vidal
  <jmmv at NetBSD dot org>)

diff --git a/ChangeLog b/ChangeLog
index e41b8c8..9c157a9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2006-08-10  John (J5) Palmieri  <johnp@redhat.com>
 
+       * tools/run-with-tmp-session-bus.sh:
+       * test/name-test/run-test.sh:
+       Remove bashisms (patch from Julio M. Merino Vidal
+       <jmmv at NetBSD dot org>)
+
+2006-08-10  John (J5) Palmieri  <johnp@redhat.com>
+
        * configure.in: add a version (>= 2.6.0) check for libxml2
 
 2006-08-10  John (J5) Palmieri  <johnp@redhat.com>

diff --git a/test/name-test/run-test.sh b/test/name-test/run-test.sh
index 706d595..6c61249 100755 (executable)
--- a/test/name-test/run-test.sh
+++ b/test/name-test/run-test.sh
@@ -1,6 +1,6 @@
-#! /bin/bash
+#! /bin/sh
 
-function die()
+ie()
 {
     if ! test -z "$DBUS_SESSION_BUS_PID" ; then
         echo "killing message bus "$DBUS_SESSION_BUS_PID >&2

diff --git a/tools/run-with-tmp-session-bus.sh b/tools/run-with-tmp-session-bus.sh
index 07cbb50..880924b 100755 (executable)
--- a/tools/run-with-tmp-session-bus.sh
+++ b/tools/run-with-tmp-session-bus.sh
@@ -4,7 +4,7 @@ SCRIPTNAME=$0
 WRAPPED_SCRIPT=$1
 shift
 
-function die() 
+die() 
 {
     if ! test -z "$DBUS_SESSION_BUS_PID" ; then
         echo "killing message bus "$DBUS_SESSION_BUS_PID >&2
@@ -19,7 +19,7 @@ if test -z "$DBUS_TOP_BUILDDIR" ; then
 fi
 
 ## convenient to be able to ctrl+C without leaking the message bus process
-trap 'die "Received SIGINT"' SIGINT
+trap 'die "Received SIGINT"' INT
 
 CONFIG_FILE=./run-with-tmp-session-bus.conf
 SERVICE_DIR="$DBUS_TOP_BUILDDIR/test/data/valid-service-files"