[arch-commits] Commit in dbus-core/trunk (PKGBUILD dbus.install)
Date: Wednesday, June 13, 2012 @ 19:16:53 Author: dreisner Revision: 161780 upgpkg: dbus-core 1.6.0-3 - package revised install file Modified: dbus-core/trunk/PKGBUILD dbus-core/trunk/dbus.install --+ PKGBUILD |2 +- dbus.install | 14 +++--- 2 files changed, 8 insertions(+), 8 deletions(-) Modified: PKGBUILD === --- PKGBUILD2012-06-13 21:37:16 UTC (rev 161779) +++ PKGBUILD2012-06-13 23:16:53 UTC (rev 161780) @@ -4,7 +4,7 @@ # 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) Modified: dbus.install === --- dbus.install2012-06-13 21:37:16 UTC (rev 161779) +++ dbus.install2012-06-13 23:16:53 UTC (rev 161780) @@ -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 run/dbus.pid ]; then + # 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 }
[arch-commits] Commit in dbus-core/trunk (PKGBUILD dbus.install)
Date: Sunday, June 24, 2012 @ 21:18:52 Author: dreisner Revision: 162319 upgpkg: dbus-core 1.6.0-5 - remove dbus-uuidgen logic from install scriplet, depend on systemd-machine-id-setup Modified: dbus-core/trunk/PKGBUILD dbus-core/trunk/dbus.install --+ PKGBUILD |4 ++-- dbus.install |6 -- 2 files changed, 2 insertions(+), 8 deletions(-) Modified: PKGBUILD === --- PKGBUILD2012-06-25 01:17:52 UTC (rev 162318) +++ PKGBUILD2012-06-25 01:18:52 UTC (rev 162319) @@ -4,12 +4,12 @@ # pkgname=dbus-core pkgver=1.6.0 -pkgrel=4 +pkgrel=5 pkgdesc="Freedesktop.org message bus system" url="http://www.freedesktop.org/Software/dbus"; arch=(i686 x86_64) license=('GPL' 'custom') -depends=('expat>=2.0.1' 'coreutils' 'filesystem' 'libsystemd' 'shadow') # shadow for install scriptlet FS#29341 +depends=('expat>=2.0.1' 'coreutils' 'filesystem' 'libsystemd' 'shadow' 'systemd-tools') # shadow for install scriptlet FS#29341 makedepends=('libx11') conflicts=('dbus<1.2.3-2') options=(!libtool) Modified: dbus.install === --- dbus.install2012-06-25 01:17:52 UTC (rev 162318) +++ dbus.install2012-06-25 01:18:52 UTC (rev 162319) @@ -2,12 +2,6 @@ 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 - - if [[ ! -L var/lib/dbus/machine-id ]]; then -[[ -e var/lib/dbus/machine-id && ! -e etc/machine-id ]] && mv var/lib/dbus/machine-id etc/ -ln -sf ../../../etc/machine-id var/lib/dbus/ - fi - dbus-uuidgen --ensure=etc/machine-id } post_upgrade() {