increment pkgrel to 2; pacman hooks

7 files changed, 66 insertions, 14 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e05b86c4f9dc..b19ded70c5d1 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,7 @@
-# Generated by mksrcinfo v8
-# Tue Mar 20 20:51:25 UTC 2018
 pkgbase = libbitcoin-node-git
 	pkgdesc = Bitcoin Full Node
 	pkgver = 20180309
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/libbitcoin/libbitcoin-node
 	install = bn.install
 	arch = i686
@@ -39,12 +37,20 @@ pkgbase = libbitcoin-node-git
 	source = bn-init.service
 	source = bn.service
 	source = obelisk-sysusers.conf
+	source = libbitcoin-node-git-01-systemd-sysusers.hook
+	source = libbitcoin-node-git-01-userdel.hook
+	source = libbitcoin-node-git-02-chown.hook
+	source = libbitcoin-node-git-02-rm-rf.hook
 	sha256sums = SKIP
 	sha256sums = SKIP
 	sha256sums = f291f3b70b430657e92fd165d6a0ebded28681ce57ab1fdb20e9324d4c68da8e
 	sha256sums = b1da043ad40e0d80519b32a8b01a66d0fb47a6d2b19e2b7ad3f1b14b6d689bdd
 	sha256sums = d3730c0c1e0fc85dec828daef1d92113a6a79f6245617934113f4b31af75bc43
 	sha256sums = 17de557ac9b8a4d354ade339904286fa074facea539984e97b5e83f45a2c305f
+	sha256sums = 6b4e2f95d4ba2a41493ccad5b867aefb9f9b4f5b8ddbbf0da9a51a4a48d915f8
+	sha256sums = ac81ca8c96872204b55de0e7076ba3e6410069a3ea292a1191aabba5f2f1839f
+	sha256sums = fa279c7ea476bda16a3d1f1dea8e3c416bca757c69d5effdbb135f45f2ba3c71
+	sha256sums = 4a284ff024ed702e42f33ec7b62c8c53495188810e6eaea02277435b3698f1c6
 
 pkgname = libbitcoin-node-git
 
diff --git a/PKGBUILD b/PKGBUILD
index 5ef692749016..829ec25ab1fe 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=libbitcoin-node-git
 pkgver=20180309
-pkgrel=1
+pkgrel=2
 pkgdesc="Bitcoin Full Node"
 arch=('i686' 'x86_64')
 depends=('boost'
@@ -31,13 +31,21 @@ source=(git+https://github.com/libbitcoin/libbitcoin-node
         bn.logrotate
         bn-init.service
         bn.service
-        obelisk-sysusers.conf)
+        obelisk-sysusers.conf
+        libbitcoin-node-git-01-systemd-sysusers.hook
+        libbitcoin-node-git-01-userdel.hook
+        libbitcoin-node-git-02-chown.hook
+        libbitcoin-node-git-02-rm-rf.hook)
 sha256sums=('SKIP'
             'SKIP'
             'f291f3b70b430657e92fd165d6a0ebded28681ce57ab1fdb20e9324d4c68da8e'
             'b1da043ad40e0d80519b32a8b01a66d0fb47a6d2b19e2b7ad3f1b14b6d689bdd'
             'd3730c0c1e0fc85dec828daef1d92113a6a79f6245617934113f4b31af75bc43'
-            '17de557ac9b8a4d354ade339904286fa074facea539984e97b5e83f45a2c305f')
+            '17de557ac9b8a4d354ade339904286fa074facea539984e97b5e83f45a2c305f'
+            '6b4e2f95d4ba2a41493ccad5b867aefb9f9b4f5b8ddbbf0da9a51a4a48d915f8'
+            'ac81ca8c96872204b55de0e7076ba3e6410069a3ea292a1191aabba5f2f1839f'
+            'fa279c7ea476bda16a3d1f1dea8e3c416bca757c69d5effdbb135f45f2ba3c71'
+            '4a284ff024ed702e42f33ec7b62c8c53495188810e6eaea02277435b3698f1c6')
 provides=('libbitcoin-node')
 conflicts=('libbitcoin-node')
 backup=('etc/obelisk/bn/bn.cfg'
@@ -124,6 +132,10 @@ package() {
   msg2 'Installing logrotate conf...'
   install -Dm 644 "$srcdir/bn.logrotate" "$pkgdir/etc/logrotate.d/bn"
 
+  # XXX: pacman hook on Remove event not firing
+  msg2 'Installing pacman hooks...'
+  install -Dm 644 "$srcdir"/*.hook -t "$pkgdir/usr/share/libalpm/hooks"
+
   msg2 'Cleaning up pkgdir...'
   find "$pkgdir" -type d -name .git -exec rm -r '{}' +
   find "$pkgdir" -type f -name .gitignore -exec rm -r '{}' +
diff --git a/bn.install b/bn.install
index 5795c9476f82..cb5e049f0b3b 100644
--- a/bn.install
+++ b/bn.install
@@ -1,8 +1,4 @@
-_bn_user=obelisk
-_bn_group=obelisk
-
 post_install() {
-  chown -R $_bn_user:$_bn_group /etc/obelisk /srv/obelisk /var/log/obelisk
   printf "%b\n" "$obelisk"
 }
 
@@ -10,10 +6,6 @@ post_upgrade() {
   post_install
 }
 
-post_remove() {
-  rm -rf /etc/obelisk /srv/obelisk /var/log/obelisk
-}
-
 read -d '' obelisk <<'EOF'
 ########################################################################
 ########################################################################
diff --git a/libbitcoin-node-git-01-systemd-sysusers.hook b/libbitcoin-node-git-01-systemd-sysusers.hook
new file mode 100644
index 000000000000..e72000432d64
--- /dev/null
+++ b/libbitcoin-node-git-01-systemd-sysusers.hook
@@ -0,0 +1,11 @@
+[Trigger]
+Operation = Install
+Operation = Upgrade
+Type = Package
+Target = libbitcoin-node-git
+
+[Action]
+Description = Adding libbitcoin node/server user...
+Depends = systemd
+When = PostTransaction
+Exec = /usr/bin/systemd-sysusers /usr/lib/sysusers.d/obelisk.conf
diff --git a/libbitcoin-node-git-01-userdel.hook b/libbitcoin-node-git-01-userdel.hook
new file mode 100644
index 000000000000..b1f49b105ac7
--- /dev/null
+++ b/libbitcoin-node-git-01-userdel.hook
@@ -0,0 +1,10 @@
+[Trigger]
+Operation = Remove
+Type = Package
+Target = libbitcoin-node-git
+
+[Action]
+Description = Removing libbitcoin node/server user...
+Depends = shadow
+When = PostTransaction
+Exec = /usr/bin/userdel -rf obelisk
diff --git a/libbitcoin-node-git-02-chown.hook b/libbitcoin-node-git-02-chown.hook
new file mode 100644
index 000000000000..e469a9f7bb81
--- /dev/null
+++ b/libbitcoin-node-git-02-chown.hook
@@ -0,0 +1,11 @@
+[Trigger]
+Operation = Install
+Operation = Upgrade
+Type = Package
+Target = libbitcoin-node-git
+
+[Action]
+Description = Setting libbitcoin node/server user directory permissions...
+Depends = coreutils
+When = PostTransaction
+Exec = /usr/bin/chown -R obelisk:obelisk /etc/obelisk /srv/obelisk /var/log/obelisk
diff --git a/libbitcoin-node-git-02-rm-rf.hook b/libbitcoin-node-git-02-rm-rf.hook
new file mode 100644
index 000000000000..7d705046f887
--- /dev/null
+++ b/libbitcoin-node-git-02-rm-rf.hook
@@ -0,0 +1,10 @@
+[Trigger]
+Operation = Remove
+Type = Package
+Target = libbitcoin-node-git
+
+[Action]
+Description = Cleaning up libbitcoin node/server user directories...
+Depends = coreutils
+When = PostTransaction
+Exec = /usr/bin/rm -rf /srv/obelisk /var/log/obelisk