[Pkg-utopia-commits] r446 - packages/unstable/dbus/debian

[Sjoerd Simons]

Author: sjoerd
Date: 2006-01-11 19:15:59 +0000 (Wed, 11 Jan 2006)
New Revision: 446

Modified:
   packages/unstable/dbus/debian/changelog
   packages/unstable/dbus/debian/dbus.postinst
Log:
Fix bashism in the post script

Modified: packages/unstable/dbus/debian/changelog
===================================================================
--- packages/unstable/dbus/debian/changelog	2006-01-11 11:57:48 UTC (rev 445)
+++ packages/unstable/dbus/debian/changelog	2006-01-11 19:15:59 UTC (rev 446)
@@ -1,3 +1,9 @@
+dbus (0.60-5) unstable; urgency=low
+
+  * Fix a bashim in the postinst script (Closes: #347453)
+
+ -- Sjoerd Simons <sjoerd at debian.org>  Wed, 11 Jan 2006 20:15:02 +0100
+
 dbus (0.60-4) unstable; urgency=low
 
   * Upload to unstable 

Modified: packages/unstable/dbus/debian/dbus.postinst
===================================================================
--- packages/unstable/dbus/debian/dbus.postinst	2006-01-11 11:57:48 UTC (rev 445)
+++ packages/unstable/dbus/debian/dbus.postinst	2006-01-11 19:15:59 UTC (rev 446)
@@ -2,17 +2,22 @@
 # -*- coding: utf-8 -*-
 # Post-installation script for D-BUS
 # Copyright © 2003 Colin Walters <walters at debian.org>
+# Copyright © 2006 Sjoerd Simons <sjoerd at debian.org>
 
+set -e
+
 MESSAGEUSER=messagebus
 MESSAGEHOME=/var/run/dbus
 
+
 chgrp "$MESSAGEUSER" "$MESSAGEHOME" 2>/dev/null || addgroup --system "$MESSAGEUSER"
 chown "$MESSAGEUSER"."$MESSAGEUSER" "$MESSAGEHOME" 2>/dev/null || \
 	adduser --system --home "$MESSAGEHOME" --no-create-home --disabled-password --ingroup "$MESSAGEUSER" "$MESSAGEUSER"
 
 # Do not restart dbus on upgrades, only on fresh installations
 if [ "$1" = "configure" ]; then
-    if [ -e /var/run/dbus/pid ] && ps --no-heading -p $(< /var/run/dbus/pid) > /dev/null; then
+    if [ -e /var/run/dbus/pid ] && 
+      ps --no-heading -p $(cat /var/run/dbus/pid) > /dev/null; then
         exit 0
     fi
 fi