Switch to systemds tmpfiles.

4 files changed, 15 insertions, 22 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 5e4e20c6ed15..219116391ce3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,8 @@
 pkgbase = ombi
 	pkgdesc = Simple automated way for users to request new content for Plex
 	pkgver = 3.0.3030
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/tidusjar/Ombi
-	install = ombi.install
 	arch = x86_64
 	arch = i686
 	arch = armv7h
@@ -24,8 +23,10 @@ pkgbase = ombi
 	options = staticlibs
 	source = ombi.service
 	source = ombi.sysusers
+	source = ombi.tmpfiles
 	sha256sums = d5893f6b665a0646054343a051e462a49569d51de224b45d3d2542b6c4e3d168
 	sha256sums = 6efc381990e1113737686d4f61795095fa8edbc176daa877fd755f1ddb3a40fa
+	sha256sums = 0e11c1e4ffb7a33d64b7237aefe93f5d4fe8ac3f7a17fa54c04837691db8fce7
 	source_x86_64 = ombi-x86_64-3.0.3030.tar.gz::https://github.com/tidusjar/Ombi/releases/download/v3.0.3030/linux.tar.gz
 	sha256sums_x86_64 = 06f2ea117fa5f5fa0988ca04fee142dfce1eae6bb2380af048c78ada7c705ffe
 	source_i686 = ombi-i686-3.0.3030.tar.gz::https://github.com/tidusjar/Ombi/releases/download/v3.0.3030/linux.tar.gz
diff --git a/PKGBUILD b/PKGBUILD
index 0ad4a6048b17..525ddfb20d38 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=ombi
 pkgver=3.0.3030
-pkgrel=1
+pkgrel=2
 pkgdesc="Simple automated way for users to request new content for Plex"
 arch=('x86_64' 'i686' 'armv7h')
 url="https://github.com/tidusjar/Ombi"
@@ -17,11 +17,11 @@ optdepends=('sonarr: TV daemon for usenet & torrents'
             'plex-media-server-plexpass: Media server (plexpass version)'
             'emby-server: Media server')
 replaces=('plexrequests')
-install='ombi.install'
 options=('staticlibs')
 
 source=("${pkgname}.service"
-        "${pkgname}.sysusers")
+        "${pkgname}.sysusers"
+        "${pkgname}.tmpfiles")
 
 source_x86_64=("${pkgname}-x86_64-${pkgver}.tar.gz::https://github.com/tidusjar/Ombi/releases/download/v${pkgver}/linux.tar.gz")
 source_i686=("${pkgname}-i686-${pkgver}.tar.gz::https://github.com/tidusjar/Ombi/releases/download/v${pkgver}/linux.tar.gz")
@@ -32,13 +32,12 @@ noextract=("${pkgname}-x86_64-${pkgver}.tar.gz"
            "${pkgname}-armv7h-${pkgver}.tar.gz")
 
 sha256sums=('d5893f6b665a0646054343a051e462a49569d51de224b45d3d2542b6c4e3d168'
-            '6efc381990e1113737686d4f61795095fa8edbc176daa877fd755f1ddb3a40fa')
+            '6efc381990e1113737686d4f61795095fa8edbc176daa877fd755f1ddb3a40fa'
+            '0e11c1e4ffb7a33d64b7237aefe93f5d4fe8ac3f7a17fa54c04837691db8fce7')
 sha256sums_x86_64=('06f2ea117fa5f5fa0988ca04fee142dfce1eae6bb2380af048c78ada7c705ffe')
 sha256sums_i686=('06f2ea117fa5f5fa0988ca04fee142dfce1eae6bb2380af048c78ada7c705ffe')
 sha256sums_armv7h=('30443ce3e25570a49967874469f89e63cd91214eec7dc3cae2f90bcbd6c591a5')
 
-
-
 prepare() {
   # The source is packaged w/o a sub directory, so create our own and 
   # extract to it. Arm package has a different name too.
@@ -47,17 +46,16 @@ prepare() {
 }
 
 package() {
-  install -d -m 755 "${pkgdir}/var/lib/ombi"
-  install -d -m 755 "${pkgdir}/usr/lib/ombi"
-
   # Copy in files and then fix permissions
+  install -d -m 755 "${pkgdir}/usr/lib/ombi"
   cp -dpr --no-preserve=ownership "${srcdir}/ombi/"* "${pkgdir}/usr/lib/ombi/"
   find ${pkgdir}/usr/lib/ombi/ -type f -exec chmod 644 '{}' ';'
   find ${pkgdir}/usr/lib/ombi/ -type d -exec chmod 755 '{}' ';'
   chmod 755 ${pkgdir}/usr/lib/ombi/Ombi
 
-  install -Dm644 "${srcdir}/ombi.service" "${pkgdir}/usr/lib/systemd/system/ombi.service"
-  install -Dm644 "${srcdir}/ombi.sysusers" "${pkgdir}/usr/lib/sysusers.d/ombi.conf"
+  install -D -m 644 "${srcdir}/ombi.service" "${pkgdir}/usr/lib/systemd/system/ombi.service"
+  install -D -m 644 "${srcdir}/ombi.sysusers" "${pkgdir}/usr/lib/sysusers.d/ombi.conf"
+  install -D -m 644 "${srcdir}/ombi.tmpfiles" "${pkgdir}/usr/lib/tmpfiles.d/ombi.conf"
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/ombi.install b/ombi.install
deleted file mode 100644
index af389eeb6eec..000000000000
--- a/ombi.install
+++ /dev/null
@@ -1,9 +0,0 @@
-post_install() {
-  # Create ombi user
-  systemd-sysusers ombi.conf
-  chown -R ombi:ombi /var/lib/ombi
-}
-
-post_upgrade() {
-  post_install $1
-}
diff --git a/ombi.tmpfiles b/ombi.tmpfiles
new file mode 100644
index 000000000000..6c0c6df46fd7
--- /dev/null
+++ b/ombi.tmpfiles
@@ -0,0 +1,3 @@
+d /var/lib/ombi 0755 ombi ombi
+Z /var/lib/ombi - ombi ombi
+Z /usr/lib/ombi - ombi ombi