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

5 files changed, 22 insertions, 12 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d3b02be87377..bce44edf5c76 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -25,9 +25,11 @@ pkgbase = radarr-aphrodite
 	source = radarr.service
 	source = radarr.tmpfiles
 	source = radarr.sysusers
-	sha512sums = feb90578b0a7f3949884f735e1ec2004b66c84c9fe4d54e578e8573551c0364d89c84ed7b38c0494ad0a24146d6c5113f65fa6da6fd31f5083b2e188cb9ed9fe
-	sha512sums = e0d55353f0bf89f826eb7eb9ee26c3e3f38bd46a8884135139536ae220c0c531d5df486bc3b50f580679f9607bb4b7bfb9f29998609dc966fbfb8e1809834650
+	source = package_info
+	sha512sums = b9725386f513db6e9cd2eaef33dc8b34b21e43faacd2c9e1c29df2e6acf8e6bbfcf055222b114c13e5d149166f6e3145ba0336502b6f4965554f14102425ef61
+	sha512sums = 2ef38a061f4438349f7dafe209328fe9de5f44712f16435805e2622050be45a3fffd1838d9fccef2d6aa7603cf05b01280df6fed957b66d2d67ceaeeedcd5f6f
 	sha512sums = c1ee3925eced182ea7fffa55a6dc2a4e099ccf18636fc237ef0a2fc9517a38cfc2a819ae5a7bc546b63e383506f9f47e89454a71e34106c579d7454d71b2299e
+	sha512sums = d66df0a1a7a4f57dc8b1111627c2c74782f8a9038f943426b1c9a2629d0b69bae7e24fe0e1f708ce6c62ff7c52b730669374a1e0724ec270cd87dd95715b5ce5
 	source_x86_64 = Radarr.aphrodite.3.0.0.2894.linux-core-x64.tar.gz::https://radarr.lidarr.audio/v1/update/aphrodite/updatefile?version=3.0.0.2894&os=linux&runtime=netcore&arch=x64
 	sha512sums_x86_64 = be3e0babdb783aba5b23b7e72c0ecac76018fbcbc8acad11c2b149fe7221d6ce9ad44b6efacd04789ce8a2efb8758daddbe5d4703da1c8eb822715c4dca1e3ee
 	source_aarch64 = Radarr.aphrodite.3.0.0.2894.linux-core-arm64.tar.gz::https://radarr.lidarr.audio/v1/update/aphrodite/updatefile?version=3.0.0.2894&os=linux&runtime=netcore&arch=arm64
diff --git a/PKGBUILD b/PKGBUILD
index b2ad53c3ad0a..48ee97e1cfbd 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -30,11 +30,13 @@ source_armv7h=("Radarr.aphrodite.${pkgver}.linux-core-arm.tar.gz::https://radarr
 
 source=('radarr.service'
         'radarr.tmpfiles'
-        'radarr.sysusers')
+        'radarr.sysusers'
+        'package_info')
 
-sha512sums=('feb90578b0a7f3949884f735e1ec2004b66c84c9fe4d54e578e8573551c0364d89c84ed7b38c0494ad0a24146d6c5113f65fa6da6fd31f5083b2e188cb9ed9fe'
-            'e0d55353f0bf89f826eb7eb9ee26c3e3f38bd46a8884135139536ae220c0c531d5df486bc3b50f580679f9607bb4b7bfb9f29998609dc966fbfb8e1809834650'
-            'c1ee3925eced182ea7fffa55a6dc2a4e099ccf18636fc237ef0a2fc9517a38cfc2a819ae5a7bc546b63e383506f9f47e89454a71e34106c579d7454d71b2299e')
+sha512sums=('b9725386f513db6e9cd2eaef33dc8b34b21e43faacd2c9e1c29df2e6acf8e6bbfcf055222b114c13e5d149166f6e3145ba0336502b6f4965554f14102425ef61'
+            '2ef38a061f4438349f7dafe209328fe9de5f44712f16435805e2622050be45a3fffd1838d9fccef2d6aa7603cf05b01280df6fed957b66d2d67ceaeeedcd5f6f'
+            'c1ee3925eced182ea7fffa55a6dc2a4e099ccf18636fc237ef0a2fc9517a38cfc2a819ae5a7bc546b63e383506f9f47e89454a71e34106c579d7454d71b2299e'
+            'd66df0a1a7a4f57dc8b1111627c2c74782f8a9038f943426b1c9a2629d0b69bae7e24fe0e1f708ce6c62ff7c52b730669374a1e0724ec270cd87dd95715b5ce5')
 sha512sums_x86_64=('be3e0babdb783aba5b23b7e72c0ecac76018fbcbc8acad11c2b149fe7221d6ce9ad44b6efacd04789ce8a2efb8758daddbe5d4703da1c8eb822715c4dca1e3ee')
 sha512sums_aarch64=('e65642c541439aa0016d10673d255154ee822eec01ab08a723068f8638f47938dc12e447867fe07d34d9ed8186975fdae14ddc31eed36457ac99e2e2dd5a7ec9')
 sha512sums_armv7h=('7a643d304542f5b6a609e43994ffde87404e78f1ceff1e0b0e1b5b8e2fc82b3b51b7a14faeeb935569358d7fe1b022403364911835361277d496f0cb9de9404f')
@@ -42,10 +44,14 @@ sha512sums_armv7h=('7a643d304542f5b6a609e43994ffde87404e78f1ceff1e0b0e1b5b8e2fc8
 
 package() {
   rm -rf "${srcdir}/Radarr/Radarr.Update"
-  install -d -m 755 "${pkgdir}/usr/lib/radarr"
-  cp -dpr --no-preserve=ownership "${srcdir}/Radarr/"* "${pkgdir}/usr/lib/radarr"
-  chmod -R a=,a+rX,u+w "${pkgdir}/usr/lib/radarr"
-  chmod +x "${pkgdir}/usr/lib/radarr/Radarr"
+  install -d -m 755 "${pkgdir}/usr/lib/radarr/bin"
+  cp -dpr --no-preserve=ownership "${srcdir}/Radarr/"* "${pkgdir}/usr/lib/radarr/bin"
+  chmod -R a=,a+rX,u+w "${pkgdir}/usr/lib/radarr/bin"
+  chmod +x "${pkgdir}/usr/lib/radarr/bin/Radarr"
+
+  # Disable built in updater.
+  install -D -m 644 "${srcdir}/package_info" "${pkgdir}/usr/lib/radarr"
+  echo "PackageVersion=${pkgver}-${pkgrel}" >> "${pkgdir}/usr/lib/radarr/package_info"
 
   install -D -m 644 "${srcdir}/radarr.service" "${pkgdir}/usr/lib/systemd/system/radarr.service"
   install -D -m 644 "${srcdir}/radarr.sysusers" "${pkgdir}/usr/lib/sysusers.d/radarr.conf"
diff --git a/package_info b/package_info
new file mode 100644
index 000000000000..d0cedffe16f0
--- /dev/null
+++ b/package_info
@@ -0,0 +1,3 @@
+PackageAuthor=fryfrog
+UpdateMethod=External
+Branch=aphrodite
diff --git a/radarr.service b/radarr.service
index f04d446bd15e..7def072accc3 100644
--- a/radarr.service
+++ b/radarr.service
@@ -6,7 +6,7 @@ After=network-online.target
 [Service]
 User=radarr
 Group=radarr
-ExecStart=/usr/lib/radarr/Radarr -nobrowser -data=/var/lib/radarr
+ExecStart=/usr/lib/radarr/bin/Radarr -nobrowser -data=/var/lib/radarr
 Type=simple
 TimeoutStopSec=20
 
diff --git a/radarr.tmpfiles b/radarr.tmpfiles
index 0aacd9fb9a04..40ab498efa53 100644
--- a/radarr.tmpfiles
+++ b/radarr.tmpfiles
@@ -1,5 +1,4 @@
 # Override this file with a modified version in /etc/tmpfiles.d/
 d /var/lib/radarr 0755 radarr radarr
 Z /var/lib/radarr - radarr radarr
-Z /usr/lib/radarr - radarr radarr
 L /var/log/radarr - - - - /var/lib/radarr/logs/