Disable built in update mechanism, go back to root:root ownership of /usr/lib/sonarr. Requires moving to ./bin, yuck.

5 files changed, 41 insertions, 21 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 9f0c12e003a7..b4cb5af21c84 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -23,10 +23,12 @@ pkgbase = sonarr-phantom
 	source = sonarr.service
 	source = sonarr.sysusers
 	source = sonarr.tmpfiles
+	source = package_info
 	sha256sums = 58182e0e8175e564db2335137319377faca9c8538e157c1048c3ade9528edaef
-	sha256sums = 0cf9f57403939df673755949ca39a1981f542b97ca28116c599f321a939f5d00
+	sha256sums = 24060db5ef0c364efbc32a6a50f77ad4b07154d0b2bb2d3ce33df80f14464521
 	sha256sums = cc3c69f719fa64335f4c5b41b2588f1ec56865fb2202f5919d3668b50b8f398e
-	sha256sums = a436a979ca3a9e78bdc410bd0027d97956bfa8d2d4f2b7bdf3f7d2ed199dd6a8
+	sha256sums = 7bf87304383b7d58ecab59b3686d00a8f1b6fbe4af3a86da35a887e4cebee411
+	sha256sums = 071cdf6960f888c7902ae2af95269de4d171706ca10823b90bf5ad27593c37ab
 
 pkgname = sonarr-phantom
 
diff --git a/PKGBUILD b/PKGBUILD
index 5ef77e3f9850..da532fff4bcd 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -9,36 +9,52 @@ pkgdesc="TV download automation for usenet and torrents."
 arch=(any)
 url="http://www.sonarr.tv"
 license=('GPL3')
-depends=('mono' 'libmediainfo' 'sqlite')
-optdepends=('sabnzbd: usenet downloader'
-            'nzbget: usenet downloader'
-            'transmission-cli: torrent downloader (CLI and daemon)'
-            'transmission-gtk: torrent downloader (GTK+)'
-            'transmission-qt: torrent downloader (Qt)'
-            'deluge: torrent downloader'
-            'rtorrent: torrent downloader'
-            'jackett: torrent indexer proxy')
+
+depends=(
+  'mono'
+  'libmediainfo'
+  'sqlite'
+)
+
+optdepends=(
+  'sabnzbd: usenet downloader'
+  'nzbget: usenet downloader'
+  'transmission-cli: torrent downloader (CLI and daemon)'
+  'transmission-gtk: torrent downloader (GTK+)'
+  'transmission-qt: torrent downloader (Qt)'
+  'deluge: torrent downloader'
+  'rtorrent: torrent downloader'
+  'jackett: torrent indexer proxy'
+)
 
 provides=('sonarr')
 
 conflicts=('sonarr'
            'sonarr-develop')
 
-source=("https://download.sonarr.tv/v3/phantom-develop/${pkgver}/Sonarr.phantom-develop.${pkgver}.linux.tar.gz"
-        "sonarr.service"
-        "sonarr.sysusers"
-        "sonarr.tmpfiles")
+source=(
+  "https://download.sonarr.tv/v3/phantom-develop/${pkgver}/Sonarr.phantom-develop.${pkgver}.linux.tar.gz"
+  'sonarr.service'
+  'sonarr.sysusers'
+  'sonarr.tmpfiles'
+  'package_info'
+)
 
 noextract=()
 sha256sums=('58182e0e8175e564db2335137319377faca9c8538e157c1048c3ade9528edaef'
-            '0cf9f57403939df673755949ca39a1981f542b97ca28116c599f321a939f5d00'
+            '24060db5ef0c364efbc32a6a50f77ad4b07154d0b2bb2d3ce33df80f14464521'
             'cc3c69f719fa64335f4c5b41b2588f1ec56865fb2202f5919d3668b50b8f398e'
-            'a436a979ca3a9e78bdc410bd0027d97956bfa8d2d4f2b7bdf3f7d2ed199dd6a8')
+            '7bf87304383b7d58ecab59b3686d00a8f1b6fbe4af3a86da35a887e4cebee411'
+            '071cdf6960f888c7902ae2af95269de4d171706ca10823b90bf5ad27593c37ab')
 
 package() {
   rm -rf "${srcdir}/Sonarr/Sonarr.Update"
-  install -d -m 755 "${pkgdir}/usr/lib/sonarr"
-  cp -dpr --no-preserve=ownership "${srcdir}/Sonarr/"* "${pkgdir}/usr/lib/sonarr"
+  install -d -m 755 "${pkgdir}/usr/lib/sonarr/bin"
+  cp -dpr --no-preserve=ownership "${srcdir}/Sonarr/"* "${pkgdir}/usr/lib/sonarr/bin"
+
+  # Disable built in updater.
+  install -D -m 644 "${srcdir}/package_info" "${pkgdir}/usr/lib/sonarr"
+  echo "PackageVersion=${pkgver}-${pkgrel}" >> "${pkgdir}/usr/lib/sonarr/package_info"
 
   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"
diff --git a/package_info b/package_info
new file mode 100644
index 000000000000..476e7d40e60f
--- /dev/null
+++ b/package_info
@@ -0,0 +1,3 @@
+PackageAuthor=fryfrog
+UpdateMethod=External
+Branch=phantom-develop
diff --git a/sonarr.service b/sonarr.service
index 56f1d25bafd5..347ae1a997d7 100644
--- a/sonarr.service
+++ b/sonarr.service
@@ -6,7 +6,7 @@ After=network-online.target
 [Service]
 User=sonarr
 Group=sonarr
-ExecStart=/usr/bin/mono --debug /usr/lib/sonarr/Sonarr.exe -nobrowser -data=/var/lib/sonarr
+ExecStart=/usr/bin/mono --debug /usr/lib/sonarr/bin/Sonarr.exe -nobrowser -data=/var/lib/sonarr
 Type=simple
 TimeoutStopSec=20
 SyslogIdentifier=sonarr
diff --git a/sonarr.tmpfiles b/sonarr.tmpfiles
index f77f9671d2b2..ae236ca35d46 100644
--- a/sonarr.tmpfiles
+++ b/sonarr.tmpfiles
@@ -1,5 +1,4 @@
 # 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/