Merge branch 'master' of git://git.server-speed.net/~flo/git/aur

1 files changed, 21 insertions, 23 deletions

diff --git a/murmur/murmur.install b/murmur/murmur.install
index d940c64..9e1446d 100644
--- a/murmur/murmur.install
+++ b/murmur/murmur.install
@@ -1,35 +1,33 @@
-# arg 1:  the new package version
-pre_install() {
-  /bin/true
-}
-
 post_install() {
-  echo ' -> The user SuperUser has a blank password! You can change'
-  echo ' -> this and administrate users with murmur-config.sh.'
-  echo ''
-}
 
-# arg 1:  the new package version
-# arg 2:  the old package version
-pre_upgrade() {
-  /bin/true
+    # bug: dbus reload here doesn't work
+    # workaround: it seems to work if you do it a few seconds later, manually
+    /etc/rc.d/dbus reload > /dev/null 
+
+	/usr/bin/getent group murmur > /dev/null || /usr/sbin/groupadd murmur
+	/usr/bin/getent passwd murmur > /dev/null || \
+        /usr/sbin/useradd -d /var/lib/murmur -g murmur -s /bin/false murmur
+
+	chown -R murmur:murmur /var/lib/murmur 
+	chown -R murmur:murmur /var/run/murmur
+	chown -R murmur:murmur /var/log/murmur
+
+	echo
+	echo '==> Set the SuperUser password with (as root):'
+	echo '==>   murmurd -ini /etc/murmur.ini -supw PASSWORD'
 }
 
 post_upgrade() {
-  /bin/true
+	post_install
 }
 
-# arg 1:  the old package version
 pre_remove() {
-  /bin/true
+	[ -f /var/run/daemons/murmur ] && /etc/rc.d/murmur stop > /dev/null
+	killall -u murmur -5
+	sleep 1
 }
 
-# arg 1:  the old package version
 post_remove() {
-  /bin/true
+    /etc/rc.d/dbus reload > /dev/null
+	/usr/sbin/userdel murmur > /dev/null
 }
-
-op=$1
-shift
-$op $*
- 
\ No newline at end of file