Updated to 5.1.2, no more need for the OG wrapper

4 files changed, 19 insertions, 21 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b997584480df..1bfe9846f943 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = nzbhydra2-nojava-bin
 	pkgdesc = Search aggregator for newznab and torznab indexers.
-	pkgver = 5.1.1
-	pkgrel = 2
+	pkgver = 5.1.2
+	pkgrel = 1
 	url = https://github.com/theotherp/nzbhydra2
 	arch = x86_64
 	arch = aarch64
@@ -17,16 +17,16 @@ pkgbase = nzbhydra2-nojava-bin
 	source = wrapper-remove-base-path-checks.patch
 	source = wrapper-remove-update-support.patch
 	source = wrapper-remove-release-type-detection.patch
-	sha256sums = dc66acae9ec02f3e8a16653b1b8e1d35be6bfded46b1649a4db53541fbdd739f
+	sha256sums = cddea77be49001614826d792e52365c014a1e0056b0210d1e1542c3d37bf8bf7
 	sha256sums = a9ceeed2b50d55c5e554c0d4c615e855fe4d3889eb118e37908fa04ffb7cb003
 	sha256sums = 8f91eb4f98f7f5c11590b29b1394dfa7ca62ad115feeac4f402c9ac094fb925a
-	sha256sums = aa332035223e4ad127f9e18a5cf15882589dbbe6df42ba2f655e4eb2eae8faa5
+	sha256sums = 8127f92afb0f70b6f79c11db0219f8b2557cb7bcafa16fd6ddb2d61166d216fe
 	sha256sums = 5660f26303826a0b8bf3f7c198c39e345e87b799e2304a79db5a77992d09cda4
 	sha256sums = 35100f4e7ab5a480f5554d9abd32e8abac20d56f873f82ecbc906d0b3fdadc73
 	sha256sums = 73fe3e7d877f4f9f301deef9f699a357a9a1574148aedb565832f0375c99bdda
-	source_x86_64 = https://github.com/theotherp/nzbhydra2/releases/download/v5.1.1/nzbhydra2-5.1.1-amd64-linux.zip
-	sha256sums_x86_64 = 65d5fd2239b00ef37ab6c2ccf030ab095de24684f0bb80c4c920c195bb3c7356
-	source_aarch64 = https://github.com/theotherp/nzbhydra2/releases/download/v5.1.1/nzbhydra2-5.1.1-arm64-linux.zip
-	sha256sums_aarch64 = 6e14386d65770a8b6c4c6dc020e47b0c4a88a5009dfbd3c1b8f50c26ca96a593
+	source_x86_64 = https://github.com/theotherp/nzbhydra2/releases/download/v5.1.2/nzbhydra2-5.1.2-amd64-linux.zip
+	sha256sums_x86_64 = 832b6bc1aecc2b1905e62727893a5a1b79d747a1c372204b772e1b7f2b4fe3ce
+	source_aarch64 = https://github.com/theotherp/nzbhydra2/releases/download/v5.1.2/nzbhydra2-5.1.2-arm64-linux.zip
+	sha256sums_aarch64 = 7abda7cd4ed8d6cf5100e5bbfd1d2db09d7ad4cfb289e5ab9b725afc2a1696f5
 
 pkgname = nzbhydra2-nojava-bin
diff --git a/PKGBUILD b/PKGBUILD
index 127c10adab88..b32b1694fd63 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,8 +2,8 @@
 # Co-Maintainer: Leon Möller <jkhsjdhjs at totally dot rip>
 
 pkgname="nzbhydra2-nojava-bin"
-pkgver=5.1.1
-pkgrel=2
+pkgver=5.1.2
+pkgrel=1
 pkgdesc="Search aggregator for newznab and torznab indexers."
 arch=('x86_64' 'aarch64')
 url="https://github.com/theotherp/nzbhydra2"
@@ -23,27 +23,25 @@ source=('nzbhydra2.service'
 source_x86_64=("https://github.com/theotherp/nzbhydra2/releases/download/v${pkgver}/${pkgname%-nojava-bin}-${pkgver}-amd64-linux.zip")
 source_aarch64=("https://github.com/theotherp/nzbhydra2/releases/download/v${pkgver}/${pkgname%-nojava-bin}-${pkgver}-arm64-linux.zip")
 
-sha256sums=('dc66acae9ec02f3e8a16653b1b8e1d35be6bfded46b1649a4db53541fbdd739f'
+sha256sums=('cddea77be49001614826d792e52365c014a1e0056b0210d1e1542c3d37bf8bf7'
             'a9ceeed2b50d55c5e554c0d4c615e855fe4d3889eb118e37908fa04ffb7cb003'
             '8f91eb4f98f7f5c11590b29b1394dfa7ca62ad115feeac4f402c9ac094fb925a'
-            'aa332035223e4ad127f9e18a5cf15882589dbbe6df42ba2f655e4eb2eae8faa5'
+            '8127f92afb0f70b6f79c11db0219f8b2557cb7bcafa16fd6ddb2d61166d216fe'
             '5660f26303826a0b8bf3f7c198c39e345e87b799e2304a79db5a77992d09cda4'
             '35100f4e7ab5a480f5554d9abd32e8abac20d56f873f82ecbc906d0b3fdadc73'
             '73fe3e7d877f4f9f301deef9f699a357a9a1574148aedb565832f0375c99bdda')
-sha256sums_x86_64=('65d5fd2239b00ef37ab6c2ccf030ab095de24684f0bb80c4c920c195bb3c7356')
-sha256sums_aarch64=('6e14386d65770a8b6c4c6dc020e47b0c4a88a5009dfbd3c1b8f50c26ca96a593')
+sha256sums_x86_64=('832b6bc1aecc2b1905e62727893a5a1b79d747a1c372204b772e1b7f2b4fe3ce')
+sha256sums_aarch64=('7abda7cd4ed8d6cf5100e5bbfd1d2db09d7ad4cfb289e5ab9b725afc2a1696f5')
 
 prepare() {
-    cp "${srcdir}/nzbhydra2wrapperPy3.py" "${srcdir}/nzbhydra2wrapperPy3p.py"
-    patch "${srcdir}/nzbhydra2wrapperPy3p.py" < "${srcdir}/wrapper-remove-base-path-checks.patch"
-    patch "${srcdir}/nzbhydra2wrapperPy3p.py" < "${srcdir}/wrapper-remove-update-support.patch"
-    patch "${srcdir}/nzbhydra2wrapperPy3p.py" < "${srcdir}/wrapper-remove-release-type-detection.patch"
+    patch "${srcdir}/nzbhydra2wrapperPy3.py" < "${srcdir}/wrapper-remove-base-path-checks.patch"
+    patch "${srcdir}/nzbhydra2wrapperPy3.py" < "${srcdir}/wrapper-remove-update-support.patch"
+    patch "${srcdir}/nzbhydra2wrapperPy3.py" < "${srcdir}/wrapper-remove-release-type-detection.patch"
 }
 
 package() {
     install -D -m 755 "${srcdir}/nzbhydra2.sh" "${pkgdir}/usr/bin/nzbhydra2"
     install -D -m 755 "${srcdir}/nzbhydra2wrapperPy3.py" "${pkgdir}/usr/lib/nzbhydra2/nzbhydra2wrapperPy3.py"
-    install -D -m 755 "${srcdir}/nzbhydra2wrapperPy3p.py" "${pkgdir}/usr/lib/nzbhydra2/nzbhydra2wrapperPy3p.py"
     install -D -m 755 "${srcdir}/core" "${pkgdir}/usr/lib/nzbhydra2/core"
     install -D -m 644 "${srcdir}/readme.md" "${pkgdir}/usr/share/doc/nzbhydra2/readme.md"
 
diff --git a/nzbhydra2.service b/nzbhydra2.service
index de5d5b0aacf7..001b2e8d339b 100644
--- a/nzbhydra2.service
+++ b/nzbhydra2.service
@@ -7,7 +7,7 @@ After=network.target
 User=nzbhydra2
 Group=nzbhydra2
 Type=simple
-WorkingDirectory=/usr/bin
+Environment="NZBHYDRA_DISABLE_WRAPPER_CHECK=1"
 ExecStart=/usr/bin/nzbhydra2 --nobrowser --datafolder /var/lib/nzbhydra2
 Restart=always
 
diff --git a/nzbhydra2.sh b/nzbhydra2.sh
index 51e5bd94d8aa..bd46d04137f7 100644
--- a/nzbhydra2.sh
+++ b/nzbhydra2.sh
@@ -1,3 +1,3 @@
 #!/usr/bin/env sh
 export NZBHYDRA_DISABLE_UPDATE=true
-exec /usr/lib/nzbhydra2/nzbhydra2wrapperPy3p.py "$@"
+exec /usr/lib/nzbhydra2/nzbhydra2wrapperPy3.py "$@"