diff options
| -rw-r--r-- | .SRCINFO | 12 | ||||
| -rw-r--r-- | PKGBUILD | 12 | ||||
| -rw-r--r-- | nzbhydra2.sh | 7 | ||||
| -rw-r--r-- | wrapper-remove-base-path-checks.patch | 30 | ||||
| -rw-r--r-- | wrapper-remove-update-support.patch | 23 |
5 files changed, 13 insertions, 71 deletions
@@ -1,6 +1,6 @@ pkgbase = nzbhydra2 pkgdesc = Search aggregator for newznab and torznab indexers. - pkgver = 5.1.2 + pkgver = 5.1.5 pkgrel = 1 url = https://github.com/theotherp/nzbhydra2 arch = any @@ -10,23 +10,19 @@ pkgbase = nzbhydra2 depends = python depends = java-runtime-headless=17 optdepends = jackett: torrent indexer proxy - source = nzbhydra2-5.1.2.tar.gz::https://github.com/theotherp/nzbhydra2/archive/refs/tags/v5.1.2.tar.gz + source = nzbhydra2-5.1.5.tar.gz::https://github.com/theotherp/nzbhydra2/archive/refs/tags/v5.1.5.tar.gz source = nzbhydra2.service source = nzbhydra2.tmpfiles source = nzbhydra2.sysusers source = nzbhydra2.sh - source = wrapper-remove-base-path-checks.patch - source = wrapper-remove-update-support.patch source = wrapper-remove-release-type-detection.patch source = disable-update-checks.patch source = skip-unneeded-builds.patch - sha256sums = 7596861c9b2d76c5016aa39f53649352956727a21259bfab50613087892ac3be + sha256sums = 01aa212629269613a13f1be65b783b9b117a301ce2d2253f8670c263e2928114 sha256sums = 2fae64a1c5979d9f7b508f1e15d0f013b7cca1f2bbbdae56f546f4c362146b68 sha256sums = a9ceeed2b50d55c5e554c0d4c615e855fe4d3889eb118e37908fa04ffb7cb003 sha256sums = 8f91eb4f98f7f5c11590b29b1394dfa7ca62ad115feeac4f402c9ac094fb925a - sha256sums = 2b1a23614959c2402e367891177fc10a3d9aa3b4cce13219a8b4edf44670d398 - sha256sums = 5660f26303826a0b8bf3f7c198c39e345e87b799e2304a79db5a77992d09cda4 - sha256sums = 35100f4e7ab5a480f5554d9abd32e8abac20d56f873f82ecbc906d0b3fdadc73 + sha256sums = 62d00aeeb4a1743d166ae46e98f4609db38426fc8866d9eb20ca7ef34b653c31 sha256sums = defb77e7b19c6abfc8380cd175bc04062a0c52d1042b8e02173133367152c8e2 sha256sums = 20c57da3a877f0390778b88cbea2f98cc88fd59a2e6f15895fd6a2ef69b245a7 sha256sums = fa133df02514af1fd10d282f6b52f03d70778dc9fdf55ca2469bc124f8c815d0 @@ -3,7 +3,7 @@ # Co-Maintainer: Leon Möller <jkhsjdhjs at totally dot rip> pkgname="nzbhydra2" -pkgver=5.1.2 +pkgver=5.1.5 pkgrel=1 pkgdesc="Search aggregator for newznab and torznab indexers." arch=('any') @@ -17,27 +17,21 @@ source=("${pkgname}-${pkgver}.tar.gz::https://github.com/theotherp/nzbhydra2/arc 'nzbhydra2.tmpfiles' 'nzbhydra2.sysusers' 'nzbhydra2.sh' - 'wrapper-remove-base-path-checks.patch' - 'wrapper-remove-update-support.patch' 'wrapper-remove-release-type-detection.patch' 'disable-update-checks.patch' 'skip-unneeded-builds.patch') -sha256sums=('7596861c9b2d76c5016aa39f53649352956727a21259bfab50613087892ac3be' +sha256sums=('01aa212629269613a13f1be65b783b9b117a301ce2d2253f8670c263e2928114' '2fae64a1c5979d9f7b508f1e15d0f013b7cca1f2bbbdae56f546f4c362146b68' 'a9ceeed2b50d55c5e554c0d4c615e855fe4d3889eb118e37908fa04ffb7cb003' '8f91eb4f98f7f5c11590b29b1394dfa7ca62ad115feeac4f402c9ac094fb925a' - '2b1a23614959c2402e367891177fc10a3d9aa3b4cce13219a8b4edf44670d398' - '5660f26303826a0b8bf3f7c198c39e345e87b799e2304a79db5a77992d09cda4' - '35100f4e7ab5a480f5554d9abd32e8abac20d56f873f82ecbc906d0b3fdadc73' + '62d00aeeb4a1743d166ae46e98f4609db38426fc8866d9eb20ca7ef34b653c31' 'defb77e7b19c6abfc8380cd175bc04062a0c52d1042b8e02173133367152c8e2' '20c57da3a877f0390778b88cbea2f98cc88fd59a2e6f15895fd6a2ef69b245a7' 'fa133df02514af1fd10d282f6b52f03d70778dc9fdf55ca2469bc124f8c815d0') prepare() { cd "${srcdir}/${pkgname}-${pkgver}" - patch -p1 < "${srcdir}/wrapper-remove-base-path-checks.patch" - patch -p1 < "${srcdir}/wrapper-remove-update-support.patch" patch -p1 < "${srcdir}/wrapper-remove-release-type-detection.patch" patch -p1 < "${srcdir}/disable-update-checks.patch" patch -p1 < "${srcdir}/skip-unneeded-builds.patch" diff --git a/nzbhydra2.sh b/nzbhydra2.sh index c93849cefa99..48ad772a8a69 100644 --- a/nzbhydra2.sh +++ b/nzbhydra2.sh @@ -1,5 +1,10 @@ #!/usr/bin/env sh + export HYDRAWORKINGFOLDER=/usr/share/java/nzbhydra2 export NZBHYDRA_DISABLE_UPDATE=true -export NZBHYDRA_DISABLE_WRAPPER_CHECK=true +export NZBHYDRA_DISABLE_UPDATE_ON_SHUTDOWN=1 +export NZBHYDRA_DISABLE_WRAPPER_CHECK=1 +export NZBHYDRA_SKIP_BASE_PATH_CHECK=1 +export NZBHYDRA_USE_BASE_PATH_FOR_LIBS=1 + exec /usr/lib/nzbhydra2/nzbhydra2wrapperPy3.py "$@" diff --git a/wrapper-remove-base-path-checks.patch b/wrapper-remove-base-path-checks.patch deleted file mode 100644 index 6edf526dd8e0..000000000000 --- a/wrapper-remove-base-path-checks.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff --git a/other/wrapper/nzbhydra2wrapperPy3.py b/other/wrapper/nzbhydra2wrapperPy3.py -index e64c80d4..a9d8843c 100644 ---- a/other/wrapper/nzbhydra2wrapperPy3.py -+++ b/other/wrapper/nzbhydra2wrapperPy3.py -@@ -304,11 +304,6 @@ def startup(): - global jarFile, process, args, unknownArgs, consoleLines - basePath = getBasePath() - -- readme = os.path.join(basePath, "readme.md") -- if not os.path.exists(readme): -- logger.critical("Unable to determine base path correctly. Please make sure to run NZBHydra in the folder where its binary is located. Current base path: " + basePath) -- sys.exit(-1) -- - releaseType = determineReleaseType() - isWindows = platform.system().lower() == "windows" - isWithTrayIcon = os.path.exists("isWindowsTrayMarkerFile") -@@ -332,12 +327,8 @@ def startup(): - console_logger.setLevel("DEBUG") - logger.info("Setting wrapper log level to DEBUG") - -- libFolder = os.path.join(basePath, "lib") -+ libFolder = basePath - if releaseType == ReleaseType.GENERIC: -- if not os.path.exists(libFolder): -- logger.critical("Error: Lib folder %s not found. An update might've failed or the installation folder is corrupt", libFolder) -- sys.exit(-1) -- - jarFiles = [os.path.join(libFolder, f) for f in os.listdir(libFolder) if os.path.isfile(os.path.join(libFolder, f)) and f.endswith(".jar")] - if len(jarFiles) == 0: - logger.critical("Error: No JAR files found in folder %s. An update might've failed or the installation folder is corrupt", libFolder) diff --git a/wrapper-remove-update-support.patch b/wrapper-remove-update-support.patch deleted file mode 100644 index a4f655d4088a..000000000000 --- a/wrapper-remove-update-support.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff --git a/other/wrapper/nzbhydra2wrapperPy3.py b/other/wrapper/nzbhydra2wrapperPy3.py -index e64c80d4..50678569 100644 ---- a/other/wrapper/nzbhydra2wrapperPy3.py -+++ b/other/wrapper/nzbhydra2wrapperPy3.py -@@ -640,8 +640,7 @@ def main(arguments): - global internalApiKey - internalApiKey = args.internalApiKey - if args.update: -- logger.info("Executing update") -- update() -+ logger.error("Updating is not supported.") - sys.exit(0) - if "--version" in unknownArgs or "--help" in unknownArgs: - # no fancy shit, just start the file -@@ -693,7 +692,7 @@ def main(arguments): - - if controlCode == 11: - logger.info("NZBHydra main process has terminated for updating") -- update() -+ logger.warning("Updating is not supported. Restarting...") - doStart = True - elif controlCode == 22: - logger.info("NZBHydra main process has terminated for restart") |