Switch to systemds tmpfiles.

4 files changed, 14 insertions, 27 deletions

diff --git a/.SRCINFO b/.SRCINFO
index cb4962935031..5aeb32a8a6f5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,8 @@
 pkgbase = nzbhydra2
 	pkgdesc = Meta search for NZB indexers
 	pkgver = 1.4.7
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/theotherp/nzbhydra2
-	install = nzbhydra2.install
 	arch = any
 	license = Apache
 	depends = python2
@@ -11,12 +10,12 @@ pkgbase = nzbhydra2
 	source = https://github.com/theotherp/nzbhydra2/releases/download/v1.4.7/nzbhydra2-1.4.7-linux.zip
 	source = https://raw.githubusercontent.com/theotherp/nzbhydra2/master/other/wrapper/nzbhydra2wrapper.py
 	source = nzbhydra2.service
-	source = nzbhydra2.install
+	source = nzbhydra2.tmpfiles
 	source = nzbhydra2.sysusers
 	sha256sums = 429e45dfda29435e76ee32fa4c654d30ddeebb2ed604089b6dd2d0d58c3ab309
 	sha256sums = 9ef57961528118292fd6775029c65ba0fde6b829a912162bcd26c7918b683289
 	sha256sums = 8c864fa865c92a6e0182f4dd3d4032ad85f09d021444cca217efafecbeff33c3
-	sha256sums = 355dafa76d39c42f0a449080b2fe3673536e409da3f3b6c89f03c09dd303438c
+	sha256sums = 315238b0b09fc3f63af140826ec7fb435a89761f3ed5b624e0b1fbacb4c23c97
 	sha256sums = 8f91eb4f98f7f5c11590b29b1394dfa7ca62ad115feeac4f402c9ac094fb925a
 
 pkgname = nzbhydra2
diff --git a/PKGBUILD b/PKGBUILD
index 6e1ddae0bf34..ad8ca8956704 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,36 +2,32 @@
 # Maintainer: Daniel Egeberg <daniel.egeberg@gmail.com>
 pkgname="nzbhydra2"
 pkgver=1.4.7
-pkgrel=1
+pkgrel=2
 pkgdesc="Meta search for NZB indexers"
 arch=('any')
 url="https://github.com/theotherp/nzbhydra2"
 license=('Apache')
 depends=('python2' 'java-runtime-headless>=8')
-install='nzbhydra2.install'
+
 source=("https://github.com/theotherp/nzbhydra2/releases/download/v${pkgver}/${pkgname}-${pkgver}-linux.zip"
         "https://raw.githubusercontent.com/theotherp/nzbhydra2/master/other/wrapper/nzbhydra2wrapper.py"
         'nzbhydra2.service'
-        'nzbhydra2.install'
+        'nzbhydra2.tmpfiles'
         'nzbhydra2.sysusers')
 
 sha256sums=('429e45dfda29435e76ee32fa4c654d30ddeebb2ed604089b6dd2d0d58c3ab309'
             '9ef57961528118292fd6775029c65ba0fde6b829a912162bcd26c7918b683289'
             '8c864fa865c92a6e0182f4dd3d4032ad85f09d021444cca217efafecbeff33c3'
-            '355dafa76d39c42f0a449080b2fe3673536e409da3f3b6c89f03c09dd303438c'
+            '315238b0b09fc3f63af140826ec7fb435a89761f3ed5b624e0b1fbacb4c23c97'
             '8f91eb4f98f7f5c11590b29b1394dfa7ca62ad115feeac4f402c9ac094fb925a')
 
 package() {
     install -d -m 755 "${pkgdir}/usr/lib/nzbhydra2"
-
-    cd "${srcdir}"
-    chmod +x nzbhydra2
-    cp -dpr --no-preserve=ownership lib nzbhydra2 readme.md "${pkgdir}/usr/lib/nzbhydra2"
-
-    install -D -m 644 "${srcdir}/nzbhydra2wrapper.py" "${pkgdir}/usr/lib/nzbhydra2"
-
-    install -d -m 755 "${pkgdir}/var/lib/nzbhydra2"
+    cp -dpr --no-preserve=ownership "${srcdir}/lib" "${srcdir}/readme.md" "${pkgdir}/usr/lib/nzbhydra2"
+    install -D -m 755 "${srcdir}/nzbhydra2wrapper.py" "${pkgdir}/usr/lib/nzbhydra2"
+    install -D -m 755 "${srcdir}/nzbhydra2" "${pkgdir}/usr/lib/nzbhydra2"
 
     install -D -m 644 "${srcdir}/nzbhydra2.service" "${pkgdir}/usr/lib/systemd/system/nzbhydra2.service"
     install -D -m 644 "${srcdir}/nzbhydra2.sysusers" "${pkgdir}/usr/lib/sysusers.d/nzbhydra2.conf"
+    install -D -m 644 "${srcdir}/nzbhydra2.tmpfiles" "${pkgdir}/usr/lib/tmpfiles.d/nzbhydra2.conf"
 }
diff --git a/nzbhydra2.install b/nzbhydra2.install
deleted file mode 100644
index ae899f3d0b08..000000000000
--- a/nzbhydra2.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-    systemd-sysusers nzbhydra2.conf
-
-    mkdir -p /var/lib/nzbhydra2
-    chown -R nzbhydra2: /var/lib/nzbhydra2
-
-}
-
-post_upgrade() {
-    chown -R nzbhydra2: /var/lib/nzbhydra2
-}
diff --git a/nzbhydra2.tmpfiles b/nzbhydra2.tmpfiles
new file mode 100644
index 000000000000..f91e971c0f15
--- /dev/null
+++ b/nzbhydra2.tmpfiles
@@ -0,0 +1,3 @@
+d /var/lib/nzbhydra2 0755 nzbhydra2 nzbhydra2
+Z /var/lib/nzbhydra2 - nzbhydra2 nzbhydra2
+Z /usr/lib/nzbhydra2 - nzbhydra2 nzbhydra2