remove pacman hooks

5 files changed, 15 insertions, 22 deletions

diff --git a/.SRCINFO b/.SRCINFO
index df8ccef79e2a..5dd8faf7f4cf 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,9 @@
 pkgbase = charge-lnd
 	pkgdesc = charge-lnd is a simple policy based fee manager for LND
 	pkgver = 0.2.8
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/accumulator/charge-lnd
+	install = charge-lnd.install
 	arch = any
 	license = GPL2
 	makedepends = python-pip
@@ -20,8 +21,7 @@ pkgbase = charge-lnd
 	source = charge-lnd.service
 	source = charge-lnd@.service
 	source = charge-lnd.timer
-	source = charge-lnd.user
-	source = charge-lnd-01-chown.hook
+	source = charge-lnd.sysusers
 	source = charge-lnd.env
 	sha256sums = 8f6fff0a1ae9b5a20855cdb2dc2aeef3f1f3cb692b6a02684305e02ea3b1cd50
 	sha256sums = SKIP
@@ -29,6 +29,5 @@ pkgbase = charge-lnd
 	sha256sums = SKIP
 	sha256sums = SKIP
 	sha256sums = SKIP
-	sha256sums = SKIP
 
 pkgname = charge-lnd
diff --git a/PKGBUILD b/PKGBUILD
index 47afa3283a35..f5ad446be635 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Douglas Chimento <dchimento@gmail.com>
 pkgname=charge-lnd
 pkgver=0.2.8
-pkgrel=1
+pkgrel=2
 pkgdesc="${pkgname} is a simple policy based fee manager for LND"
 url='https://github.com/accumulator/charge-lnd'
 depends=('python' 'python-setuptools' 'python-googleapis-common-protos' 'python-grpcio' 'python-protobuf' 'python-six' 'python-termcolor' 'python-colorama' 'python-aiorpcx')
@@ -10,8 +10,9 @@ makedepends=('python-pip')
 checkdepends=()
 license=('GPL2')
 arch=('any')
-source=("https://github.com/accumulator/charge-lnd/archive/refs/tags/v${pkgver}.tar.gz" "${pkgname}.service" "${pkgname}@.service" "${pkgname}.timer" "${pkgname}.user" "${pkgname}-01-chown.hook" "${pkgname}.env")
-sha256sums=('8f6fff0a1ae9b5a20855cdb2dc2aeef3f1f3cb692b6a02684305e02ea3b1cd50' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP') 
+install=${pkgname}.install
+source=("https://github.com/accumulator/charge-lnd/archive/refs/tags/v${pkgver}.tar.gz" "${pkgname}.service" "${pkgname}@.service" "${pkgname}.timer" "${pkgname}.sysusers" "${pkgname}.env")
+sha256sums=('8f6fff0a1ae9b5a20855cdb2dc2aeef3f1f3cb692b6a02684305e02ea3b1cd50' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP')
 
 build() {
   cd "$pkgname-$pkgver"
@@ -26,8 +27,6 @@ package() {
   install -Dm 644 "$srcdir/${pkgname}.env" "$pkgdir/etc/default/${pkgname}"
   install -Dm 644 examples/* -t "$pkgdir/etc/charge-lnd"
   
-  install -Dm 644 "$srcdir/${pkgname}.user" "$pkgdir/usr/lib/sysusers.d/${pkgname}.conf"
-  msg2 'Installing pacman hooks...'
-  install -Dm 644 "$srcdir"/*.hook -t "$pkgdir/usr/share/libalpm/hooks"
+  install -Dm 644 "${srcdir}/${pkgname}.sysusers" "${pkgdir}/usr/lib/sysusers.d/${pkgname}.conf"
   install -Dm 644 "$srcdir"/*.service -t "$pkgdir/usr/lib/systemd/system"
 }
diff --git a/charge-lnd-01-chown.hook b/charge-lnd-01-chown.hook
deleted file mode 100644
index a2a38770e093..000000000000
--- a/charge-lnd-01-chown.hook
+++ /dev/null
@@ -1,12 +0,0 @@
-[Trigger]
-Operation = Install
-Operation = Upgrade
-Type = Package
-Target = charge-lnd
-
-[Action]
-Description = Setting daemon user directory permissions...
-Depends = coreutils
-When = PostTransaction
-Exec = /usr/bin/chown -R charge-lnd:charge-lnd /etc/charge-lnd 
-
diff --git a/charge-lnd.install b/charge-lnd.install
new file mode 100644
index 000000000000..2d57cc9b561b
--- /dev/null
+++ b/charge-lnd.install
@@ -0,0 +1,7 @@
+post_install() {
+  systemd-sysusers charge-lnd.conf
+}
+
+post_upgrade() {
+  systemctl daemon-reload
+}
diff --git a/charge-lnd.user b/charge-lnd.sysusers
index dc6acb1f8aa3..dc6acb1f8aa3 100644
--- a/charge-lnd.user
+++ b/charge-lnd.sysusers