mirror of
https://github.com/archlinux/aur.git
synced 2026-02-09 06:38:44 +01:00
5.1.5
This commit is contained in:
John-Gee
parent
b1df66658c
commit
c77ff436ee
6 changed files with 31 additions and 100 deletions
22
.SRCINFO
22
.SRCINFO
|
|
@ -1,7 +1,7 @@
|
|||
pkgbase = nzbhydra2-nojava-bin
|
||||
pkgdesc = Search aggregator for newznab and torznab indexers.
|
||||
pkgver = 5.1.2
|
||||
pkgrel = 2
|
||||
pkgver = 5.1.5
|
||||
pkgrel = 1
|
||||
url = https://github.com/theotherp/nzbhydra2
|
||||
arch = x86_64
|
||||
arch = aarch64
|
||||
|
|
@ -13,20 +13,16 @@ pkgbase = nzbhydra2-nojava-bin
|
|||
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 = nzbhydra2.sh
|
||||
sha256sums = 2fae64a1c5979d9f7b508f1e15d0f013b7cca1f2bbbdae56f546f4c362146b68
|
||||
sha256sums = a9ceeed2b50d55c5e554c0d4c615e855fe4d3889eb118e37908fa04ffb7cb003
|
||||
sha256sums = 8f91eb4f98f7f5c11590b29b1394dfa7ca62ad115feeac4f402c9ac094fb925a
|
||||
sha256sums = 8e9109dd0979bf9d8423bfe59ba63c0c22144881dfe16a82e4644e32f9e4bc01
|
||||
sha256sums = 5660f26303826a0b8bf3f7c198c39e345e87b799e2304a79db5a77992d09cda4
|
||||
sha256sums = 35100f4e7ab5a480f5554d9abd32e8abac20d56f873f82ecbc906d0b3fdadc73
|
||||
sha256sums = 73fe3e7d877f4f9f301deef9f699a357a9a1574148aedb565832f0375c99bdda
|
||||
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
|
||||
sha256sums = f322cfbfb360ede7b815ed63262032d48d459fc1f775ad4b95b6a585a97f2bdd
|
||||
sha256sums = 861e535862f41e958e53ce1c4fa31c5ee4477c5bf7c44442b1050cbbedbfef7a
|
||||
source_x86_64 = https://github.com/theotherp/nzbhydra2/releases/download/v5.1.5/nzbhydra2-5.1.5-amd64-linux.zip
|
||||
sha256sums_x86_64 = 36c96cad0b8afaa83a64d9a407925f9cd310fed912c330c63f8d07cdb2559869
|
||||
source_aarch64 = https://github.com/theotherp/nzbhydra2/releases/download/v5.1.5/nzbhydra2-5.1.5-arm64-linux.zip
|
||||
sha256sums_aarch64 = c32d92a9a7aca0ea2971140e4c4313abcf36f4fe058a678fa31c5172fdde0f53
|
||||
|
||||
pkgname = nzbhydra2-nojava-bin
|
||||
|
|
|
|||
22
PKGBUILD
22
PKGBUILD
|
|
@ -2,8 +2,8 @@
|
|||
# Co-Maintainer: Leon Möller <jkhsjdhjs at totally dot rip>
|
||||
|
||||
pkgname="nzbhydra2-nojava-bin"
|
||||
pkgver=5.1.2
|
||||
pkgrel=2
|
||||
pkgver=5.1.5
|
||||
pkgrel=1
|
||||
pkgdesc="Search aggregator for newznab and torznab indexers."
|
||||
arch=('x86_64' 'aarch64')
|
||||
url="https://github.com/theotherp/nzbhydra2"
|
||||
|
|
@ -16,26 +16,20 @@ optdepends=('jackett: torrent indexer proxy')
|
|||
source=('nzbhydra2.service'
|
||||
'nzbhydra2.tmpfiles'
|
||||
'nzbhydra2.sysusers'
|
||||
'nzbhydra2.sh'
|
||||
'wrapper-remove-base-path-checks.patch'
|
||||
'wrapper-remove-update-support.patch'
|
||||
'wrapper-remove-release-type-detection.patch')
|
||||
'wrapper-remove-release-type-detection.patch'
|
||||
'nzbhydra2.sh')
|
||||
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=('2fae64a1c5979d9f7b508f1e15d0f013b7cca1f2bbbdae56f546f4c362146b68'
|
||||
'a9ceeed2b50d55c5e554c0d4c615e855fe4d3889eb118e37908fa04ffb7cb003'
|
||||
'8f91eb4f98f7f5c11590b29b1394dfa7ca62ad115feeac4f402c9ac094fb925a'
|
||||
'8e9109dd0979bf9d8423bfe59ba63c0c22144881dfe16a82e4644e32f9e4bc01'
|
||||
'5660f26303826a0b8bf3f7c198c39e345e87b799e2304a79db5a77992d09cda4'
|
||||
'35100f4e7ab5a480f5554d9abd32e8abac20d56f873f82ecbc906d0b3fdadc73'
|
||||
'73fe3e7d877f4f9f301deef9f699a357a9a1574148aedb565832f0375c99bdda')
|
||||
sha256sums_x86_64=('832b6bc1aecc2b1905e62727893a5a1b79d747a1c372204b772e1b7f2b4fe3ce')
|
||||
sha256sums_aarch64=('7abda7cd4ed8d6cf5100e5bbfd1d2db09d7ad4cfb289e5ab9b725afc2a1696f5')
|
||||
'f322cfbfb360ede7b815ed63262032d48d459fc1f775ad4b95b6a585a97f2bdd'
|
||||
'861e535862f41e958e53ce1c4fa31c5ee4477c5bf7c44442b1050cbbedbfef7a')
|
||||
sha256sums_x86_64=('36c96cad0b8afaa83a64d9a407925f9cd310fed912c330c63f8d07cdb2559869')
|
||||
sha256sums_aarch64=('c32d92a9a7aca0ea2971140e4c4313abcf36f4fe058a678fa31c5172fdde0f53')
|
||||
|
||||
prepare() {
|
||||
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"
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,9 @@
|
|||
#!/usr/bin/env sh
|
||||
export NZBHYDRA_DISABLE_UPDATE=true
|
||||
export NZBHYDRA_DISABLE_WRAPPER_CHECK=true
|
||||
#export NZBHYDRA_DISABLE_WRAPPER_CHECK=true
|
||||
export NZBHYDRA_DISABLE_UPDATE_ON_SHUTDOWN=true
|
||||
export NZBHYDRA_FORCE_GENERIC=native
|
||||
export NZBHYDRA_SKIP_BASE_PATH_CHECK=false
|
||||
export NZBHYDRA_USE_BASE_PATH_FOR_LIBS=true
|
||||
|
||||
exec /usr/lib/nzbhydra2/nzbhydra2wrapperPy3.py "$@"
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
|
|
@ -1,24 +1,13 @@
|
|||
diff --git a/other/wrapper/nzbhydra2wrapperPy3.py b/other/wrapper/nzbhydra2wrapperPy3.py
|
||||
index e64c80d4..bd9e57ba 100644
|
||||
--- a/other/wrapper/nzbhydra2wrapperPy3.py
|
||||
+++ b/other/wrapper/nzbhydra2wrapperPy3.py
|
||||
@@ -491,18 +491,7 @@ def startup():
|
||||
@@ -499,6 +499,10 @@
|
||||
|
||||
|
||||
def determineReleaseType():
|
||||
- if os.path.exists("lib"):
|
||||
- releaseType = ReleaseType.GENERIC
|
||||
- if os.path.exists("core") or os.path.exists("core.exe"):
|
||||
- logger.warning("lib folder and core(.exe) found. Either delete the executable to use the generic release type (using java and ignoring the executable) or delete the lib folder to use the executable and not require java")
|
||||
- elif os.path.exists("core") or os.path.exists("core.exe"):
|
||||
- releaseType = ReleaseType.NATIVE
|
||||
- else:
|
||||
- logger.critical(
|
||||
- "Unable to determine the release type. Neither lib folder nor core(.exe) found")
|
||||
- sys.exit(-1)
|
||||
- logger.info("Determined release type: " + releaseType)
|
||||
- return releaseType
|
||||
+ return ReleaseType.NATIVE
|
||||
|
||||
|
||||
def escape_parameter(is_windows, parameter):
|
||||
+ forcedReleaseType = os.environ.get('NZBHYDRA_FORCE_GENERIC')
|
||||
+ if forcedReleaseType is not None:
|
||||
+ logger.info("Release type " + forcedReleaseType + " forced by environment variable ")
|
||||
+ return forcedReleaseType
|
||||
if os.path.exists("lib"):
|
||||
releaseType = ReleaseType.GENERIC
|
||||
if os.path.exists("core") or os.path.exists("core.exe"):
|
||||
|
|
|
|||
|
|
@ -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")
|
||||
Loading…
Add table
Reference in a new issue