Using sysusers.d and tmpfiles.d for hqplayer user

1 files changed, 25 insertions, 22 deletions

diff --git a/PKGBUILD b/PKGBUILD
index c562f8fc4118..a36c5d932ed3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,48 +1,51 @@
-## Maintainer: AudioLinux  <audiolinux AT fastmail DOT fm>
+## Maintainer: AudioLinux  audiolinux@fastmail.fm
 
 pkgname=hqplayer-embedded
 _rpmver=4.22.3-59
 _debpkgver=4.22.3-67
 pkgver=4.22.3
-pkgrel=3
+pkgrel=4
 pkgdesc="Signalyst HQPlayer Embedded
  HQPlayer - the high-end upsampling multichannel software HD-audio player"
 arch=('x86_64' 'aarch64')
 url="http://www.signalyst.com/custom.html"
 license=('custom')
-depends=('alsa-lib' 'glibc' 'flac' 'gcc-libs' 'libgmpris' 'glib2' 'rygel' 'adduser-deb' 'zip' 'unzip' 'wavpack' 'gupnp' 'openmp')
-source_x86_64=("https://www.signalyst.eu/bins/hqplayerd/fc33/hqplayerd-"$_rpmver".fc33.x86_64.rpm" 'hqplayerd.service')
+depends=('alsa-lib' 'glibc' 'flac' 'gcc-libs' 'libgmpris' 'glib2' 'rygel' 'zip' 'unzip' 'wavpack' 'gupnp' 'openmp')
 conflicts=('hqplayer-embedded-amd' 'hqplayer-embedded-rocm')
-install=install
-source_aarch64=("https://www.signalyst.eu/bins/hqplayerd/buster/hqplayerd_"$_debpkgver"_arm64.deb" 'hqplayerd.service')
-sha256sums_x86_64=('b98933a9c898fe14abcef0e8ec64657d737cfdf4b3678fc67c1f887776fff0e1'
-'5d4194a704979b3ff92482e155769460906745a66e759142eba33a2226f9cb3a')
-sha256sums_aarch64=('5ee9595652b3289fe96ad5f33102fd062d2583a1eeb65fb615293067a8d9d8f8'
-'5d4194a704979b3ff92482e155769460906745a66e759142eba33a2226f9cb3a')
+source=('hqplayerd.service'
+        'hqplayerd_user.service'
+        'sysusers.d'
+        'tmpfiles.d'
+        )
+source_x86_64=("https://www.signalyst.eu/bins/hqplayerd/fc33/hqplayerd-"$_rpmver".fc33.x86_64.rpm")
+source_aarch64=("https://www.signalyst.eu/bins/hqplayerd/buster/hqplayerd_"$_debpkgver"_arm64.deb")
+sha256sums=('d46242c40660ddf877eff89e2459a76fe5fbecb5621fd727aad742d69cbf96d1'
+           '5d4194a704979b3ff92482e155769460906745a66e759142eba33a2226f9cb3a'
+           '911b813c6d6b4b88daab7c28566136112f1217dce7f890902fd0f46a519c50fc'
+           '353eb19a099092f1ee3b34b46a68e684b221003f221dc92e2c6e929311d0ff83')
+sha256sums_x86_64=('b98933a9c898fe14abcef0e8ec64657d737cfdf4b3678fc67c1f887776fff0e1')
+sha256sums_aarch64=('5ee9595652b3289fe96ad5f33102fd062d2583a1eeb65fb615293067a8d9d8f8')
+install=${pkgname}.install
 
 package() {
   if [ "$(uname -m)" == "x86_64" ]; then
   bsdtar xf hqplayerd-"$_rpmver".fc33.x86_64.rpm -C "$pkgdir"
-  else
-  cd "$srcdir"
-  bsdtar xf data.tar.xz -C "$pkgdir"
-  fi
-  
-  install -Dm644 "hqplayerd.service" "$pkgdir/usr/lib/systemd/user/hqplayerd.service"
-  
-  if [ "$(uname -m)" == "x86_64" ]; then
   install -Dm644 "$pkgdir/usr/share/doc/hqplayerd/LICENSE" "$pkgdir/usr/share/licenses/$pkgname/COPYING"
   rm "$pkgdir/usr/share/doc/hqplayerd/LICENSE"
   else
+  cd "$srcdir"
+  bsdtar xf data.tar.xz -C "$pkgdir"
   install -Dm644 "$pkgdir/usr/share/doc/hqplayerd/copyright" "$pkgdir/usr/share/licenses/$pkgname/COPYING"
   rm "$pkgdir/usr/share/doc/hqplayerd/copyright"
-  install -Dm644 "$pkgdir/lib/systemd/system/hqplayerd.service" "$pkgdir/usr/lib/systemd/system/hqplayerd.service"
   rm -rf "$pkgdir/lib"
   fi
   
-  cp "$pkgdir/etc/hqplayer/hqplayerd.xml" "$pkgdir/usr/share/doc/hqplayerd/hqplayerd.xml"
-  rm "$pkgdir/etc/hqplayer/hqplayerd.xml"
-  
+  install -Dm644 "hqplayerd_user.service" "$pkgdir/usr/lib/systemd/user/hqplayerd.service"
+  install -Dm644 "hqplayerd.service" "$pkgdir/usr/lib/systemd/system/hqplayerd.service"
+  install -Dm644 tmpfiles.d             "${pkgdir}"/usr/lib/tmpfiles.d/hqplayer.conf
+  install -Dm644 sysusers.d             "${pkgdir}"/usr/lib/sysusers.d/hqplayer.conf
+  install -Dm644 "$pkgdir/etc/hqplayer/hqplayerd.xml" "$pkgdir/usr/share/doc/hqplayerd/hqplayerd.xml"
+
   rm -rf "$pkgdir/etc/modules-load.d"
   rm -rf "$pkgdir/etc/udev"
 }