summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO8
-rw-r--r--PKGBUILD15
-rw-r--r--nzbhydra2.service2
3 files changed, 15 insertions, 10 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 22b069e38f85..4ba321bf3af4 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,19 +1,21 @@
pkgbase = nzbhydra2
pkgdesc = Meta search for NZB indexers
pkgver = 1.0.18
- pkgrel = 1
+ pkgrel = 2
url = https://github.com/theotherp/nzbhydra2
install = nzbhydra2.install
arch = any
license = Apache
+ depends = python2
depends = java-runtime-headless>=8
- conflicts = nzbhydra2-git
source = https://github.com/theotherp/nzbhydra2/releases/download/v1.0.18/nzbhydra2-1.0.18-linux.zip
+ source = https://raw.githubusercontent.com/theotherp/nzbhydra2/master/other/wrapper/nzbhydra2wrapper.py
source = nzbhydra2.service
source = nzbhydra2.install
source = nzbhydra2.sysusers
sha256sums = d7c04f325760ecc0b8b52b9d88c0721d73e5967647e8e1c8becffcd67ebb94c6
- sha256sums = 53cf695a8f03ab9c12754be6460dead8225b3a012f0f26675cead846521aeee1
+ sha256sums = 07fe26612eed64a1c64704e963d834fdd52435fd37470325f196cab6f464c3a9
+ sha256sums = 8c864fa865c92a6e0182f4dd3d4032ad85f09d021444cca217efafecbeff33c3
sha256sums = 355dafa76d39c42f0a449080b2fe3673536e409da3f3b6c89f03c09dd303438c
sha256sums = 8f91eb4f98f7f5c11590b29b1394dfa7ca62ad115feeac4f402c9ac094fb925a
diff --git a/PKGBUILD b/PKGBUILD
index ab0f3270f7e5..a75537313b8b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,21 +2,22 @@
# Maintainer: Daniel Egeberg <daniel.egeberg@gmail.com>
pkgname="nzbhydra2"
pkgver=1.0.18
-pkgrel=1
+pkgrel=2
pkgdesc="Meta search for NZB indexers"
arch=('any')
url="https://github.com/theotherp/nzbhydra2"
license=('Apache')
-depends=('java-runtime-headless>=8')
-conflicts=('nzbhydra2-git')
+depends=('python2' 'java-runtime-headless>=8')
install='nzbhydra2.install'
source=("https://github.com/theotherp/nzbhydra2/releases/download/v${pkgver}/${pkgname}-${pkgver}-linux.zip"
+ "https://raw.githubusercontent.com/theotherp/nzbhydra2/master/other/wrapper/nzbhydra2wrapper.py"
'nzbhydra2.service'
'nzbhydra2.install'
'nzbhydra2.sysusers')
sha256sums=('d7c04f325760ecc0b8b52b9d88c0721d73e5967647e8e1c8becffcd67ebb94c6'
- '53cf695a8f03ab9c12754be6460dead8225b3a012f0f26675cead846521aeee1'
+ '07fe26612eed64a1c64704e963d834fdd52435fd37470325f196cab6f464c3a9'
+ '8c864fa865c92a6e0182f4dd3d4032ad85f09d021444cca217efafecbeff33c3'
'355dafa76d39c42f0a449080b2fe3673536e409da3f3b6c89f03c09dd303438c'
'8f91eb4f98f7f5c11590b29b1394dfa7ca62ad115feeac4f402c9ac094fb925a')
@@ -24,8 +25,10 @@ package() {
install -d -m 755 "${pkgdir}/usr/lib/nzbhydra2"
cd "${srcdir}"
- chmod +x nzbhydra2 downloaderScripts/*.py
- cp -dpr --no-preserve=ownership downloaderScripts lib nzbhydra2 readme.md "${pkgdir}/usr/lib/nzbhydra2"
+ chmod +x nzbhydra2
+ cp -dpr --no-preserve=ownership lib nzbhydra2 readme.md "${pkgdir}/usr/lib/nzbhydra2"
+
+ install -D -m 644 "${srcdir}/nzbhydra2wrapper.py" "${pkgdir}/usr/lib/nzbhydra2"
install -d -m 755 "${pkgdir}/var/lib/nzbhydra2"
diff --git a/nzbhydra2.service b/nzbhydra2.service
index 75160a3aac1d..ce09a09e9cc0 100644
--- a/nzbhydra2.service
+++ b/nzbhydra2.service
@@ -8,7 +8,7 @@ User=nzbhydra2
Group=nzbhydra2
Type=simple
WorkingDirectory=/usr/lib/nzbhydra2
-ExecStart=/usr/lib/nzbhydra2/nzbhydra2 --nobrowser --datafolder /var/lib/nzbhydra2
+ExecStart=/usr/bin/python2 /usr/lib/nzbhydra2/nzbhydra2wrapper.py --nobrowser --datafolder /var/lib/nzbhydra2
Restart=always
[Install]