summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorDonald Webster2017-06-08 19:23:13 -0700
committerDonald Webster2017-06-08 19:24:22 -0700
commit36399074179ead5e077b4b3a90ac7fd36001317c (patch)
tree79226c3029b55b2d71e4867211182c0cb17efce3
parent6f20266ba21b22ac625e40a894c5dd4cc8ad7297 (diff)
downloadaur-36399074179ead5e077b4b3a90ac7fd36001317c.tar.gz
Run python2 directly.
-rw-r--r--.SRCINFO8
-rw-r--r--PKGBUILD9
-rw-r--r--nzbhydra.service2
-rwxr-xr-xnzbhydra.sh2
4 files changed, 7 insertions, 14 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 380f2809588f..b7093343e666 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
# Generated by mksrcinfo v8
-# Fri May 19 18:08:18 UTC 2017
+# Fri Jun 9 02:24:14 UTC 2017
pkgbase = nzbhydra
pkgdesc = Meta search for NZB indexers
pkgver = 0.2.218
- pkgrel = 1
+ pkgrel = 2
url = https://github.com/theotherp/nzbhydra
install = nzbhydra.install
arch = any
@@ -12,13 +12,11 @@ pkgbase = nzbhydra
optdepends = python2-lxml: faster result processing
conflicts = nzbhydra-git
source = nzbhydra-0.2.218.tar.gz::https://github.com/theotherp/nzbhydra/archive/0.2.218.tar.gz
- source = nzbhydra.sh
source = nzbhydra.service
source = nzbhydra.install
source = nzbhydra.sysusers
sha256sums = 853fac6a018beef7464377ff8bd5720aae3849cfea6ac7c7841c04d4175b0160
- sha256sums = 91552953d0d956101136cd3165f217de4d14eb65042b7dd3e9a09c8657319436
- sha256sums = 0643666218ceb8b35a65c9b420de26ea9e334fccfc39472f698a090d2056176a
+ sha256sums = 069e149cbf6a0d01c11b3ce681c016f8477f03ab6682e21f26f1d6891bdad790
sha256sums = f1d2028ef593ce367438fed6520d4387482da74e45aacafc72c028a2a0337614
sha256sums = 0c901b44980cdfcfd62a49883ea2edd954e8f60711f10b49958f9a402a7ad2d0
diff --git a/PKGBUILD b/PKGBUILD
index 9323116f75c8..4aade2a36052 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,8 @@
+# Maintainer: Donald Webster <fryfrog@gmail.com>
# Maintainer: Daniel Egeberg <daniel.egeberg@gmail.com>
pkgname="nzbhydra"
pkgver=0.2.218
-pkgrel=1
+pkgrel=2
pkgdesc="Meta search for NZB indexers"
arch=('any')
url="https://github.com/theotherp/nzbhydra"
@@ -11,14 +12,12 @@ optdepends=('python2-lxml: faster result processing')
conflicts=('nzbhydra-git')
install='nzbhydra.install'
source=("$pkgname-$pkgver.tar.gz::https://github.com/theotherp/nzbhydra/archive/$pkgver.tar.gz"
- 'nzbhydra.sh'
'nzbhydra.service'
'nzbhydra.install'
'nzbhydra.sysusers')
sha256sums=('853fac6a018beef7464377ff8bd5720aae3849cfea6ac7c7841c04d4175b0160'
- '91552953d0d956101136cd3165f217de4d14eb65042b7dd3e9a09c8657319436'
- '0643666218ceb8b35a65c9b420de26ea9e334fccfc39472f698a090d2056176a'
+ '069e149cbf6a0d01c11b3ce681c016f8477f03ab6682e21f26f1d6891bdad790'
'f1d2028ef593ce367438fed6520d4387482da74e45aacafc72c028a2a0337614'
'0c901b44980cdfcfd62a49883ea2edd954e8f60711f10b49958f9a402a7ad2d0')
@@ -30,8 +29,6 @@ package() {
python2 -m compileall -q "${pkgdir}/usr/lib/nzbhydra"
- install -D -m 755 "${srcdir}/nzbhydra.sh" "${pkgdir}/usr/bin/nzbhydra"
-
install -d -m 755 "${pkgdir}/var/lib/nzbhydra"
mkdir -m 755 "${pkgdir}/var/lib/nzbhydra/flask_session"
diff --git a/nzbhydra.service b/nzbhydra.service
index fd3047e7e1df..07f64d24fec6 100644
--- a/nzbhydra.service
+++ b/nzbhydra.service
@@ -5,7 +5,7 @@ After=network.target
[Service]
User=nzbhydra
Group=nzbhydra
-ExecStart=/usr/bin/nzbhydra --nobrowser --config /etc/nzbhydra/settings.cfg --database /var/lib/nzbhydra/nzbhydra.db
+ExecStart=/usr/bin/python2 /usr/lib/nzbhydra/nzbhydra.py --nobrowser --config /etc/nzbhydra/settings.cfg --database /var/lib/nzbhydra/nzbhydra.db
Type=simple
TimeoutStopSec=20
Restart=always
diff --git a/nzbhydra.sh b/nzbhydra.sh
deleted file mode 100755
index 8c7286ec8b3b..000000000000
--- a/nzbhydra.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec python2 /usr/lib/nzbhydra/nzbhydra.py "$@"