now with more sysusersd

3 files changed, 7 insertions, 35 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 5362a000b527..9f240085116e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,11 +1,10 @@
 # Generated by mksrcinfo(replacement shim) v8
-# Mon Apr  5 08:06:16 PM EDT 2021
+# Sun Jun  6 08:37:19 PM EDT 2021
 pkgbase = signald
 	pkgdesc = An unofficial daemon that facilitates communication with the Signal messaging app.
 	pkgver = 0.13.1
 	pkgrel = 1
 	url = https://gitlab.com/signald/signald
-	install = signald.install
 	arch = any
 	license = GPL3
 	makedepends = gradle
@@ -15,10 +14,7 @@ pkgbase = signald
 	backup = var/lib/signald/data
 	source = signald-0.13.1.tar.gz::https://gitlab.com/signald/signald/-/archive/0.13.1/signald-0.13.1.tar.gz
 	source = gradle-no-daemon.patch
-	source = signald.install
 	sha512sums = a413781248a10505294fe8c36772d887ecbbbf63a9a38a93994674e1cad0a23ac3cc5f4d8aae5fe0c0363fd2b96bc881100a06aed38f13bf524b24dd5930d540
 	sha512sums = aa2ff9eef6ebd8ad31275a587b7b24e34938e9744b06892c96d43e274b18a15d2f0258f56cea8fea9163e85a754ebde1e66c20781876bcb524960defe02ce535
-	sha512sums = 9ac1f323657bdf0357d005635394f0b21a74a76d3b25307c9ccec32c10eed00686e584a021028658ebd023c029c3b44485713532bb6f04b30c887790bf617a42
 
 pkgname = signald
-
diff --git a/PKGBUILD b/PKGBUILD
index bd427189f8e6..f6a9107619af 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,5 +1,4 @@
 # Maintainer: GI_Jack <GI_Jack@hackermail.com>
-# Original: zer0def <zer0def on freenode>
 
 pkgname=signald
 pkgver=0.13.1
@@ -13,17 +12,12 @@ depends=('java-runtime>=11')
 optdepends=('qrencode: display account linking token as QR code')
 conflicts=('signald-git')
 source=("${pkgname}-${pkgver}.tar.gz::https://gitlab.com/signald/signald/-/archive/${pkgver}/signald-${pkgver}.tar.gz"
-        'gradle-no-daemon.patch'
-        'signald.install')
+        'gradle-no-daemon.patch')
 sha512sums=('a413781248a10505294fe8c36772d887ecbbbf63a9a38a93994674e1cad0a23ac3cc5f4d8aae5fe0c0363fd2b96bc881100a06aed38f13bf524b24dd5930d540'
-            'aa2ff9eef6ebd8ad31275a587b7b24e34938e9744b06892c96d43e274b18a15d2f0258f56cea8fea9163e85a754ebde1e66c20781876bcb524960defe02ce535'
-            '9ac1f323657bdf0357d005635394f0b21a74a76d3b25307c9ccec32c10eed00686e584a021028658ebd023c029c3b44485713532bb6f04b30c887790bf617a42')
+            'aa2ff9eef6ebd8ad31275a587b7b24e34938e9744b06892c96d43e274b18a15d2f0258f56cea8fea9163e85a754ebde1e66c20781876bcb524960defe02ce535')
             
 backup=('var/lib/signald/data')
 
-install=${pkgname}.install
-_daemon_uid=565
-
 prepare() {
     cd "${srcdir}/${pkgname}-${pkgver}"
     patch -Np1 < ${srcdir}/gradle-no-daemon.patch
@@ -47,4 +41,8 @@ package() {
     install -Dm644 "${srcdir}/${pkgname}-${pkgver}/debian/signald.service" "${pkgdir}/usr/lib/systemd/system/signald.service"
 
     install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+ 
+    # systemd sysusers https://archlinux.org/todo/switch-to-systemd-sysusers/
+    mkdir "${pkgdir}/usr/lib/sysusers.d/"
+    echo 'u signald - "Signald Daemon User"' > "${pkgdir}/usr/lib/sysusers.d/signald.conf"
 }
diff --git a/signald.install b/signald.install
deleted file mode 100644
index d47897d0a483..000000000000
--- a/signald.install
+++ /dev/null
@@ -1,22 +0,0 @@
-post_install() {
-    _daemon_uid=565
-    if ! getent group signald &>/dev/null; then
-        groupadd -r -g ${_daemon_uid} signald >/dev/null
-    fi
-    if ! getent passwd signald &>/dev/null; then
-        useradd -r -u ${_daemon_uid} -g signald -d /var/lib/signald -s /bin/false -c signald signald >/dev/null
-    fi
-}
-
-post_upgrade() {
-    post_install
-}
-
-post_remove() {
-    if getent passwd signald &>/dev/null; then
-        userdel signald >/dev/null
-    fi
-    if getent group signald &>/dev/null; then
-        groupdel signald >/dev/null
-    fi
-}