summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorDonald Webster2018-07-12 10:07:20 -0700
committerDonald Webster2018-07-12 10:07:38 -0700
commitf164ce93b909e747f5b20c79f5650bd17dfaf445 (patch)
tree59eeede75559c7de366ee35f206ae1120a8be325
parent1867db5ae3f15adaa4b0e6937d3c859bd797055b (diff)
downloadaur-f164ce93b909e747f5b20c79f5650bd17dfaf445.tar.gz
Switch to tmpfiles for permissions, format install file.
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD8
-rw-r--r--sonarr.install19
-rw-r--r--sonarr.tmpfiles5
4 files changed, 22 insertions, 16 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 1cc5edfadddc..91cf826c7a46 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -21,12 +21,14 @@ pkgbase = sonarr-develop
conflicts = sonarr
source = https://download.sonarr.tv/v2/develop/mono/NzbDrone.develop.2.0.0.5239.mono.tar.gz
source = sonarr.service
- source = sonarr.sysusers
source = sonarr.install
+ source = sonarr.sysusers
+ source = sonarr.tmpfiles
sha256sums = 15206c3ba421c7db282de82562084a473666e09447d2ccd7fa28557e03860548
sha256sums = ffcd28b3779aae0edf093956dfbd3239bea0b32561da75ab1d198de92db197c5
+ sha256sums = bd00676bddce255e42ebbed60e4af6d0910b0efcd0602f2307dedb510dd22033
sha256sums = cc3c69f719fa64335f4c5b41b2588f1ec56865fb2202f5919d3668b50b8f398e
- sha256sums = ce45de775371d7b05f8f1313679b8a94e093fb2fae8ea2cb7558428c1d51d9af
+ sha256sums = a436a979ca3a9e78bdc410bd0027d97956bfa8d2d4f2b7bdf3f7d2ed199dd6a8
pkgname = sonarr-develop
diff --git a/PKGBUILD b/PKGBUILD
index 311267c68544..7825442fbe87 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -22,13 +22,16 @@ provides=('sonarr')
conflicts=('sonarr')
source=("https://download.sonarr.tv/v2/develop/mono/NzbDrone.develop.${pkgver}.mono.tar.gz"
"sonarr.service"
+ "sonarr.install"
"sonarr.sysusers"
- "sonarr.install")
+ "sonarr.tmpfiles")
+
noextract=()
sha256sums=('15206c3ba421c7db282de82562084a473666e09447d2ccd7fa28557e03860548'
'ffcd28b3779aae0edf093956dfbd3239bea0b32561da75ab1d198de92db197c5'
+ 'bd00676bddce255e42ebbed60e4af6d0910b0efcd0602f2307dedb510dd22033'
'cc3c69f719fa64335f4c5b41b2588f1ec56865fb2202f5919d3668b50b8f398e'
- 'ce45de775371d7b05f8f1313679b8a94e093fb2fae8ea2cb7558428c1d51d9af')
+ 'a436a979ca3a9e78bdc410bd0027d97956bfa8d2d4f2b7bdf3f7d2ed199dd6a8')
package() {
cd "$srcdir"
@@ -40,4 +43,5 @@ package() {
install -D -m 644 "${srcdir}/sonarr.sysusers" "${pkgdir}/usr/lib/sysusers.d/sonarr.conf"
install -D -m 644 "${srcdir}/sonarr.service" "${pkgdir}/usr/lib/systemd/system/sonarr.service"
+ install -D -m 644 "${srcdir}/sonarr.tmpfiles" "${pkgdir}/usr/lib/tmpfiles.d/sonarr.conf"
}
diff --git a/sonarr.install b/sonarr.install
index ae55c94effe3..c0026f8d950b 100644
--- a/sonarr.install
+++ b/sonarr.install
@@ -1,18 +1,13 @@
post_install() {
- systemd-sysusers sonarr.conf
-
- chown -R sonarr: /var/lib/sonarr
- if [[ ! -f /var/lib/sonarr/config.xml ]]
- then
- if [[ -f /var/lib/nzbdrone/config.xml ]]
- then
- echo "A previous installation of nzbdrone has been detected. Copying previous configuration to Sonarr"
- cp /var/lib/nzbdrone/* /var/lib/sonarr
- fi
- fi
+ if [[ ! -f /var/lib/sonarr/config.xml ]]; then
+ if [[ -f /var/lib/nzbdrone/config.xml ]]; then
+ echo "Previous installation of nzbdrone detected, copying to sonarr."
+ cp /var/lib/nzbdrone/* /var/lib/sonarr
+ fi
+ fi
}
post_upgrade() {
- post_install $1
+ post_install $1
}
diff --git a/sonarr.tmpfiles b/sonarr.tmpfiles
new file mode 100644
index 000000000000..f77f9671d2b2
--- /dev/null
+++ b/sonarr.tmpfiles
@@ -0,0 +1,5 @@
+# Override this file with a modified version in /etc/tmpfiles.d/
+d /var/lib/sonarr 0755 sonarr sonarr
+Z /var/lib/sonarr - sonarr sonarr
+Z /usr/lib/sonarr - sonarr sonarr
+L /var/log/sonarr - - - - /var/lib/sonarr/logs/