Release Update Runit Service confirmed proper operation

4 files changed, 21 insertions, 46 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c8bb46532c59..feaed498dc81 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = jackett-runit
 	pkgdesc = Use many torrent trackers with software that supports torznab/potato feeds.
-	pkgver = 0.16.1724
-	pkgrel = 3
+	pkgver = 0.16.1740
+	pkgrel = 1
 	url = https://github.com/Jackett/Jackett
 	arch = x86_64
 	arch = aarch64
@@ -15,17 +15,15 @@ pkgbase = jackett-runit
 	source = run
 	source = jackett.sysusers
 	source = jackett.tmpfiles
-	source = jackett-service.desktop
-	sha256sums = dd8cf665c118a7c87e796c20d790989e0b1a1e12d16feba2a28e3465ad45be67
+	sha256sums = ceac561ee2755a0ec2d4ffa9e381f0ecb422ac34e77f65df996a10d79fda429b
 	sha256sums = d005fcd009ec5404e1ec88246c31e664167f5551d6cabc35f68eb41750bfe590
 	sha256sums = 64022e15565a609f449090f02d53ee90ef95cffec52ae14f99e4e2132b6cffe1
-	sha256sums = c692b09f8df44cac73e53e76a707f4087a58a146b7d0c8043b44182aae3c2f6a
-	source_x86_64 = Jackett.Binaries.LinuxAMDx64-0.16.1724.tar.gz::https://github.com/Jackett/Jackett/releases/download/v0.16.1724/Jackett.Binaries.LinuxAMDx64.tar.gz
-	sha256sums_x86_64 = 1692b10c5611f1cba34a3c16c066ddcd008dd4b954f9a8b796bb07c93e0208ca
-	source_aarch64 = Jackett.Binaries.LinuxARM64-0.16.1724.tar.gz::https://github.com/Jackett/Jackett/releases/download/v0.16.1724/Jackett.Binaries.LinuxARM64.tar.gz
-	sha256sums_aarch64 = 507b4ccf6b10739ea53aecc3cde72dab13e408f5c562a4955270a6350136d171
-	source_armv7h = Jackett.Binaries.LinuxARM32-0.16.1724.tar.gz::https://github.com/Jackett/Jackett/releases/download/v0.16.1724/Jackett.Binaries.LinuxARM32.tar.gz
-	sha256sums_armv7h = df71a0873f5483954e9dded923c0ff450e5e29f4be491a268c66ea7d68c8b74b
+	source_x86_64 = Jackett.Binaries.LinuxAMDx64-0.16.1740.tar.gz::https://github.com/Jackett/Jackett/releases/download/v0.16.1740/Jackett.Binaries.LinuxAMDx64.tar.gz
+	sha256sums_x86_64 = bc2de77bc8541e5cf2199afe0f8fbf252d5275c1fb5a0989f8a8190470e17ff2
+	source_aarch64 = Jackett.Binaries.LinuxARM64-0.16.1740.tar.gz::https://github.com/Jackett/Jackett/releases/download/v0.16.1740/Jackett.Binaries.LinuxARM64.tar.gz
+	sha256sums_aarch64 = 9c0a4b68d6f4397ffbef3af142c9924550ad6b8a10c22d5659d11e3439a24091
+	source_armv7h = Jackett.Binaries.LinuxARM32-0.16.1740.tar.gz::https://github.com/Jackett/Jackett/releases/download/v0.16.1740/Jackett.Binaries.LinuxARM32.tar.gz
+	sha256sums_armv7h = 31449f94938a957063bf8a109ba93d8391bd725d5d762ebd6204bc420ac66912
 
 pkgname = jackett-runit
 
diff --git a/PKGBUILD b/PKGBUILD
index 06b50a7ec09f..45e198333ccd 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,9 +2,8 @@
 # Maintainer: Donald Webster <fryfrog@gmail.com>
 
 pkgname=jackett-runit
-pkgver=0.16.1724
-pkgrel=3
-_user=$(logname)
+pkgver=0.16.1740
+pkgrel=1
 pkgdesc='Use many torrent trackers with software that supports torznab/potato feeds.'
 arch=('x86_64' 'aarch64' 'armv7h')
 license=('GPL')
@@ -15,44 +14,31 @@ options=('!strip' 'staticlibs')
 
 source=("run"
         "jackett.sysusers"
-        "jackett.tmpfiles"
-        "jackett-service.desktop")
+        "jackett.tmpfiles")
 
 source_x86_64=("Jackett.Binaries.LinuxAMDx64-${pkgver}.tar.gz::https://github.com/Jackett/Jackett/releases/download/v${pkgver}/Jackett.Binaries.LinuxAMDx64.tar.gz")
 source_armv7h=("Jackett.Binaries.LinuxARM32-${pkgver}.tar.gz::https://github.com/Jackett/Jackett/releases/download/v${pkgver}/Jackett.Binaries.LinuxARM32.tar.gz")
 source_aarch64=("Jackett.Binaries.LinuxARM64-${pkgver}.tar.gz::https://github.com/Jackett/Jackett/releases/download/v${pkgver}/Jackett.Binaries.LinuxARM64.tar.gz")
 
-sha256sums=('dd8cf665c118a7c87e796c20d790989e0b1a1e12d16feba2a28e3465ad45be67'
+sha256sums=('ceac561ee2755a0ec2d4ffa9e381f0ecb422ac34e77f65df996a10d79fda429b'
             'd005fcd009ec5404e1ec88246c31e664167f5551d6cabc35f68eb41750bfe590'
-            '64022e15565a609f449090f02d53ee90ef95cffec52ae14f99e4e2132b6cffe1'
-            'c692b09f8df44cac73e53e76a707f4087a58a146b7d0c8043b44182aae3c2f6a')
+            '64022e15565a609f449090f02d53ee90ef95cffec52ae14f99e4e2132b6cffe1')
 
-sha256sums_x86_64=('1692b10c5611f1cba34a3c16c066ddcd008dd4b954f9a8b796bb07c93e0208ca')
-sha256sums_armv7h=('df71a0873f5483954e9dded923c0ff450e5e29f4be491a268c66ea7d68c8b74b')
-sha256sums_aarch64=('507b4ccf6b10739ea53aecc3cde72dab13e408f5c562a4955270a6350136d171')
+sha256sums_x86_64=('bc2de77bc8541e5cf2199afe0f8fbf252d5275c1fb5a0989f8a8190470e17ff2')
+sha256sums_armv7h=('31449f94938a957063bf8a109ba93d8391bd725d5d762ebd6204bc420ac66912')
+sha256sums_aarch64=('9c0a4b68d6f4397ffbef3af142c9924550ad6b8a10c22d5659d11e3439a24091')
 
 package() {
     cd "$srcdir"
        
     install -d -m 755 "${pkgdir}/usr/lib/jackett/"
     install -d -m 755 "${pkgdir}/home/jackett/runit/service"
-    install -d -m 755 "${pkgdir}/usr/share/applications/"
+    install -d -m 755 "${pkgdir}/etc/runit/sv/jackett/"
     cp -r "${srcdir}/Jackett/"* "${pkgdir}/usr/lib/jackett/"
 
-    #install -D -m 644 "${srcdir}/jackett.service" "${pkgdir}/usr/lib/systemd/system/jackett.service"
     install -D -m 644 "${srcdir}/jackett.sysusers" "${pkgdir}/usr/lib/sysusers.d/jackett.conf"
     install -D -m 644 "${srcdir}/jackett.tmpfiles" "${pkgdir}/usr/lib/tmpfiles.d/jackett.conf"
-    #install -D -m 644 "${srcdir}/run" "${pkgdir}/etc/runit/sv/jackett/run"
+    install -D -m 644 "${srcdir}/run" "${pkgdir}/etc/runit/sv/jackett/run"
+    chmod +x "${pkgdir}/etc/runit/sv/jackett/run"
     
-    install -D -m 644 "jackett-service.desktop" "${pkgdir}/home/${_user}/.config/autostart/jackett-service.desktop"
-    chown "${_user}:${_user}" "${pkgdir}/home/${_user}/.config/autostart/jackett-service.desktop" 
-    install -D -m 644 "jackett-service.desktop" "${pkgdir}/usr/share/applications/jackett-service.desktop"
-    #chmod +x "${pkgdir}/etc/runit/sv/jackett/run"
-
-    install -D -m 644 "run" "${pkgdir}/opt/jackett/jackett.sh"
-    chmod +x "${pkgdir}/opt/jackett/jackett.sh"
-
-	echo 'Jackett Service has been added to your /home/'${_user}'/.config/autostart/ applications.'
-    echo 'You may also start the service, as a normal user now, by issuing the command:'
-    echo '---->   /opt/jackett/jackett.sh'
 }
diff --git a/jackett-service b/jackett-service
deleted file mode 100644
index 91b0f1107ef1..000000000000
--- a/jackett-service
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-
-export USER="jackett"
-export HOME="/home/jackett"
-
-groups="$(id -Gn "$USER" | tr ' ' ':')"
-svdir="$HOME/service"
-
-exec chpst -u "$USER:$groups" runsvdir "$svdir"
diff --git a/run b/run
index ad720f481421..a3df6747585b 100644
--- a/run
+++ b/run
@@ -1,4 +1,4 @@
 #!/bin/sh
 
-/usr/lib/jackett/jackett --NoRestart --NoUpdates --DataFolder /var/lib/jackett
+exec chpst -u jackett /usr/lib/jackett/jackett --NoRestart --NoUpdates --DataFolder /var/lib/jackett