Using sysusers.d and tmpfiles.d for roon user, added build to version

6 files changed, 64 insertions, 37 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 1d1a5879d794..659a7362a4d9 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,9 @@
 pkgbase = roonbridge
 	pkgdesc = The music player for music lovers
-	pkgver = 1.7
+	pkgver = 1.7.571
 	pkgrel = 1
 	url = https://roonlabs.com/
+	install = roonbridge.install
 	arch = x86_64
 	arch = armv7h
 	arch = aarch64
@@ -11,24 +12,20 @@ pkgbase = roonbridge
 	depends = glibc
 	depends = ffmpeg
 	depends = cifs-utils
+	source = roonbridge.service
+	source = sysusers.d
+	source = tmpfiles.d
+	source = copyright
+	sha256sums = 141a57f660165f5b04614c643392e941825192bf3f4243aa2ecd75ed099462eb
+	sha256sums = 7cf041520e73ac4b5d4529658350b5a530415c3fc070080f6ea260871f2af38a
+	sha256sums = f2f568abf30931649642686bf8d7b66c19731e1121cf542d125475bd93a87dea
+	sha256sums = 31b6cac147644ad4d0908906b91e631752111939be88031e03da72182de5be93
 	source_x86_64 = http://download.roonlabs.com/builds/RoonBridge_linuxx64.tar.bz2
-	source_x86_64 = roonbridge.service
-	source_x86_64 = copyright
 	sha256sums_x86_64 = SKIP
-	sha256sums_x86_64 = 1d1fafdabcdb1c2496e5704481cac1fad2fe2347646e1987176f1b3ce5d288f6
-	sha256sums_x86_64 = 31b6cac147644ad4d0908906b91e631752111939be88031e03da72182de5be93
 	source_armv7h = http://download.roonlabs.com/builds/RoonBridge_linuxarmv7hf.tar.bz2
-	source_armv7h = roonbridge.service
-	source_armv7h = copyright
 	sha256sums_armv7h = SKIP
-	sha256sums_armv7h = 1d1fafdabcdb1c2496e5704481cac1fad2fe2347646e1987176f1b3ce5d288f6
-	sha256sums_armv7h = 31b6cac147644ad4d0908906b91e631752111939be88031e03da72182de5be93
 	source_aarch64 = http://download.roonlabs.com/builds/RoonBridge_linuxarmv8.tar.bz2
-	source_aarch64 = roonbridge.service
-	source_aarch64 = copyright
 	sha256sums_aarch64 = SKIP
-	sha256sums_aarch64 = 1d1fafdabcdb1c2496e5704481cac1fad2fe2347646e1987176f1b3ce5d288f6
-	sha256sums_aarch64 = 31b6cac147644ad4d0908906b91e631752111939be88031e03da72182de5be93
 
 pkgname = roonbridge
 
diff --git a/PKGBUILD b/PKGBUILD
index d934d49e3394..5e5f24be9aaf 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,8 @@
-# Maintainer: AudioLinux  <audiolinux AT fastmail DOT fm>
+# Maintainer: Audiolinux  audiolinux@fastmail.fm
 
 pkgname=roonbridge
-pkgver=1.7
+_pkgname=RoonBridge
+pkgver=1.7.571
 pkgrel=1
 _pkgrel_x86_64=1
 _pkgrel_armv7h=1
@@ -11,20 +12,35 @@ arch=('x86_64' 'armv7h' 'aarch64')
 url="https://roonlabs.com/"
 license=('custom')
 depends=('alsa-lib' 'glibc' 'ffmpeg' 'cifs-utils')
-source_x86_64=("http://download.roonlabs.com/builds/RoonBridge_linuxx64.tar.bz2" 'roonbridge.service' 'copyright')
-source_armv7h=("http://download.roonlabs.com/builds/RoonBridge_linuxarmv7hf.tar.bz2" 'roonbridge.service' 'copyright')
-source_aarch64=("http://download.roonlabs.com/builds/RoonBridge_linuxarmv8.tar.bz2" 'roonbridge.service' 'copyright')
-sha256sums_x86_64=('SKIP' '1d1fafdabcdb1c2496e5704481cac1fad2fe2347646e1987176f1b3ce5d288f6' '31b6cac147644ad4d0908906b91e631752111939be88031e03da72182de5be93')
-sha256sums_armv7h=('SKIP' '1d1fafdabcdb1c2496e5704481cac1fad2fe2347646e1987176f1b3ce5d288f6' '31b6cac147644ad4d0908906b91e631752111939be88031e03da72182de5be93')
-sha256sums_aarch64=('SKIP' '1d1fafdabcdb1c2496e5704481cac1fad2fe2347646e1987176f1b3ce5d288f6' '31b6cac147644ad4d0908906b91e631752111939be88031e03da72182de5be93')
+source=('roonbridge.service'
+        'sysusers.d'
+        'tmpfiles.d'
+        'copyright')
+source_x86_64=("http://download.roonlabs.com/builds/RoonBridge_linuxx64.tar.bz2")
+source_armv7h=("http://download.roonlabs.com/builds/RoonBridge_linuxarmv7hf.tar.bz2")
+source_aarch64=("http://download.roonlabs.com/builds/RoonBridge_linuxarmv8.tar.bz2")
+sha256sums=('141a57f660165f5b04614c643392e941825192bf3f4243aa2ecd75ed099462eb'
+            '7cf041520e73ac4b5d4529658350b5a530415c3fc070080f6ea260871f2af38a'
+            'f2f568abf30931649642686bf8d7b66c19731e1121cf542d125475bd93a87dea'
+            '31b6cac147644ad4d0908906b91e631752111939be88031e03da72182de5be93')
+sha256sums_x86_64=('SKIP')
+sha256sums_armv7h=('SKIP')
+sha256sums_aarch64=('SKIP')
+install=${pkgname}.install
+
+pkgver() {
+  grep build ${srcdir}/$_pkgname/VERSION | sed -e 's/ (build /./' -e 's/).*//' -e 's/ //g'
+}
 
 package() {
    cd "$srcdir"
    mkdir -p ${pkgdir}/opt/
    bsdtar xf RoonBridge_*.tar.bz2 -C "$pkgdir/opt"
    chown -R root:root "$pkgdir/opt/RoonBridge"
-   install -Dm644 "roonbridge.service" \
-    "$pkgdir/usr/lib/systemd/system/roonbridge.service"
-   install -Dm644 "copyright" \
-    "$pkgdir/usr/share/licenses/$pkgname/COPYING"
+
+  install -Dm644 tmpfiles.d             "${pkgdir}"/usr/lib/tmpfiles.d/roonbridge.conf
+  install -Dm644 sysusers.d             "${pkgdir}"/usr/lib/sysusers.d/roonbridge.conf
+  install -Dm644 "roonbridge.service"  "$pkgdir/usr/lib/systemd/system/roonbridge.service"
+  install -Dm644 "copyright"           "$pkgdir/usr/share/licenses/$pkgname/COPYING"
+
 }
diff --git a/roonbridge.install b/roonbridge.install
new file mode 100644
index 000000000000..246fa797c838
--- /dev/null
+++ b/roonbridge.install
@@ -0,0 +1,11 @@
+post_install () {
+if [[ $(ls -l /var/roon | grep root) ]]; then
+chown -R roon:roon /var/roon
+fi
+}
+
+post_upgrade() {
+if [[ $(ls -l /var/roon | grep root) ]]; then
+chown -R roon:roon /var/roon
+fi
+}
diff --git a/roonbridge.service b/roonbridge.service
index 58e753c82ad4..3b4d3065cf02 100644
--- a/roonbridge.service
+++ b/roonbridge.service
@@ -1,15 +1,15 @@
 [Unit]
-    Description=RoonBridge
-    After=network-online.target sound.target
-    Wants=network-online.target
+Description=RoonBridge
+After=network-online.target sound.target
+Wants=network-online.target
 
-    [Service]
-    Type=simple
-    User=root
-    Environment=ROON_DATAROOT=/var/roon
-    Environment=ROON_ID_DIR=/var/roon
-    ExecStart=/opt/RoonBridge/start.sh
-    Restart=on-abort
+[Service]
+Type=simple
+User=roon
+Environment=ROON_DATAROOT=/var/roon
+Environment=ROON_ID_DIR=/var/roon
+ExecStart=/opt/RoonBridge/start.sh
+Restart=on-abort
 
-    [Install]
-    WantedBy=multi-user.target
+[Install]
+WantedBy=multi-user.target
diff --git a/sysusers.d b/sysusers.d
new file mode 100644
index 000000000000..845e695d309d
--- /dev/null
+++ b/sysusers.d
@@ -0,0 +1,2 @@
+u roon - -
+m roon audio
diff --git a/tmpfiles.d b/tmpfiles.d
new file mode 100644
index 000000000000..7ea3a976739d
--- /dev/null
+++ b/tmpfiles.d
@@ -0,0 +1 @@
+d /var/roon  0755 roon roon