From 63a600a5f9102d817332db9fb746a4153ed62b51 Mon Sep 17 00:00:00 2001 From: root Date: Fri, 15 Jun 2012 00:01:47 +0000 Subject: Fri Jun 15 00:01:47 UTC 2012 --- testing/dbus-core/PKGBUILD | 4 ++-- testing/dbus-core/dbus.install | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) (limited to 'testing') diff --git a/testing/dbus-core/PKGBUILD b/testing/dbus-core/PKGBUILD index 4bb1ebcd6..0fb547d74 100644 --- a/testing/dbus-core/PKGBUILD +++ b/testing/dbus-core/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 161496 2012-06-12 00:28:40Z dreisner $ +# $Id: PKGBUILD 161781 2012-06-13 23:17:07Z dreisner $ # Maintainer: Jan de Groot # Contributor: Link Dupont # pkgname=dbus-core pkgver=1.6.0 -pkgrel=2 +pkgrel=3 pkgdesc="Freedesktop.org message bus system" url="http://www.freedesktop.org/Software/dbus" arch=(i686 x86_64) diff --git a/testing/dbus-core/dbus.install b/testing/dbus-core/dbus.install index 44f4475ee..218a930e7 100644 --- a/testing/dbus-core/dbus.install +++ b/testing/dbus-core/dbus.install @@ -1,24 +1,24 @@ post_install() { - getent group dbus >/dev/null || usr/sbin/groupadd -g 81 dbus - getent passwd dbus >/dev/null || usr/sbin/useradd -c 'System message bus' -u 81 -g dbus -d '/' -s /bin/false dbus - usr/bin/passwd -l dbus &>/dev/null + getent group dbus >/dev/null || groupadd -g 81 dbus + getent passwd dbus >/dev/null || useradd -c 'System message bus' -u 81 -g dbus -d '/' -s /bin/false dbus + passwd -l dbus &>/dev/null dbus-uuidgen --ensure } post_upgrade() { post_install - #Make sure new rc script can shutdown running dbus - if [ -f var/run/dbus/pid ]; then - mv var/run/dbus/pid var/run/dbus.pid + # Make sure new rc script can shutdown running dbus + if [ -f run/dbus.pid -a -d run/dbus ]; then + mv run/dbus.pid run/dbus/pid fi } post_remove() { if getent passwd dbus >/dev/null; then - usr/sbin/userdel dbus + userdel dbus fi if getent group dbus >/dev/null; then - usr/sbin/groupdel dbus + groupdel dbus fi } -- cgit v1.2.3-54-g00ecf