[arch-commits] Commit in mpd/trunk (PKGBUILD mpd mpd.install)

[Andrea Scarpino]

    Date: Saturday, April 17, 2010 @ 21:09:11
  Author: andrea
Revision: 77787

upgpkg: mpd 0.15.9-4
removed chown /var/run/mpd from .install; chown /var/run/mpd in initscript; save old mpd.conf as mpd.conf.pacsave; more checks and cleanup .install as orbisvicis suggest, thanks (FS#19133)

Modified:
  mpd/trunk/PKGBUILD
  mpd/trunk/mpd
  mpd/trunk/mpd.install

-------------+
 PKGBUILD    |    4 ++--
 mpd         |    2 +-
 mpd.install |   17 +++++++++--------
 3 files changed, 12 insertions(+), 11 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-04-17 20:22:46 UTC (rev 77786)
+++ PKGBUILD	2010-04-18 01:09:11 UTC (rev 77787)
@@ -5,7 +5,7 @@
 
 pkgname=mpd
 pkgver=0.15.9
-pkgrel=3
+pkgrel=4
 pkgdesc="Music daemon that plays MP3, FLAC, and Ogg Vorbis files"
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -17,7 +17,7 @@
 source=("http://downloads.sourceforge.net/musicpd/${pkgname}-${pkgver}.tar.bz2"
         'mpd')
 md5sums=('88f7bc0b17eac81d03b24929d12b8aa1'
-         '63b4320c8eb415c1ddc6e5fb5e272944')
+         '84583825d4a191aeb89f5709a3808118')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}

Modified: mpd
===================================================================
--- mpd	2010-04-17 20:22:46 UTC (rev 77786)
+++ mpd	2010-04-18 01:09:11 UTC (rev 77787)
@@ -6,7 +6,7 @@
 case "$1" in
   start)
     stat_busy "Starting Music Player Daemon"
-    [ ! -d /var/run/mpd ] && install -d /var/run/mpd
+    [ ! -d /var/run/mpd ] && install -d -g 45 -o 45 /var/run/mpd
     /usr/bin/mpd /etc/mpd.conf &> /dev/null
     if [ $? -gt 0 ]; then
       stat_fail

Modified: mpd.install
===================================================================
--- mpd.install	2010-04-17 20:22:46 UTC (rev 77786)
+++ mpd.install	2010-04-18 01:09:11 UTC (rev 77787)
@@ -1,17 +1,18 @@
 post_install() {
+  post_upgrade
   echo "==> mpd: Create a config under /etc/mpd.conf before using MPD (Example: /etc/mpd.conf.example)"
-  groupadd -g 45 mpd &>/dev/null
-  useradd -u 45 -g mpd -d /var/lib/mpd -s /bin/true mpd &>/dev/null
-  gpasswd -a mpd audio &>/dev/null
-  chown mpd:mpd -R /var/{lib,log,run}/mpd &>/dev/null
 }
 
 post_upgrade() {
-  chown mpd:mpd -R /var/{lib,log,run}/mpd &>/dev/null
+  getent group "mpd" &>/dev/null || groupadd -r -g 45 mpd 1>/dev/null
+  getent passwd "mpd" &>/dev/null || useradd -r -u 45 -g mpd -d "/var/lib/mpd" -s "/bin/true" -G "audio" 1>/dev/null
+  for dir in /var/{lib,log}/mpd; do
+    chown -R mpd:mpd "$dir" 1>/dev/null
+  done
 }
 
 post_remove() {
-  getent passwd mpd >/dev/null 2>&1 && userdel mpd &>/dev/null
-  getent group mpd >/dev/null 2>&1 && groupdel mpd &>/dev/null
-  [ -f etc/mpd.conf ] && rm etc/mpd.conf &>/dev/null
+  getent passwd "mpd" &>/dev/null && userdel mpd 1>/dev/null
+  getent group "mpd" &>/dev/null && groupdel mpd 1>/dev/null
+  [ -f etc/mpd.conf ] && mv etc/mpd.conf etc/mpd.conf.pacsave 1>/dev/null
 }
\ No newline at end of file