summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichał Kępień <github@kempniu.pl>2016-11-18 21:02:05 +0100
committerJustin Bronder <jsbronder@gentoo.org>2016-11-19 11:33:12 -0500
commit23150df6ad2364e1d4de4438f8ef1379c20257c9 (patch)
tree0a98b4af8124c41597f21dd1254a5d80a97aa036 /net-nntp
parentMigrate to python-single-r1 (diff)
downloadgentoo-23150df6ad2364e1d4de4438f8ef1379c20257c9.tar.gz
gentoo-23150df6ad2364e1d4de4438f8ef1379c20257c9.tar.bz2
gentoo-23150df6ad2364e1d4de4438f8ef1379c20257c9.zip
Drop custom wrapper script
Diffstat (limited to 'net-nntp')
-rw-r--r--net-nntp/sabnzbd/files/sabnzbd14
-rwxr-xr-xnet-nntp/sabnzbd/files/sabnzbd.initd2
-rw-r--r--net-nntp/sabnzbd/sabnzbd-1.1.1.ebuild10
3 files changed, 5 insertions, 21 deletions
diff --git a/net-nntp/sabnzbd/files/sabnzbd b/net-nntp/sabnzbd/files/sabnzbd
deleted file mode 100644
index ccc1a67fcf7..00000000000
--- a/net-nntp/sabnzbd/files/sabnzbd
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/sh
-
-pyexe=python2.7
-
-if [ ! -x /usr/bin/${pyexe} ]; then
- pyexe=python2.6
-fi
-
-if [ ! -x /usr/bin/${pyexe} ]; then
- echo "No suitable python executable found in /usr/sbin (python2.6 || python2.7)"
- exit 1
-fi
-
-cd /usr/share/sabnzbd && /usr/bin/${pyexe} SABnzbd.py $*
diff --git a/net-nntp/sabnzbd/files/sabnzbd.initd b/net-nntp/sabnzbd/files/sabnzbd.initd
index ad11573f549..a2a8407a48c 100755
--- a/net-nntp/sabnzbd/files/sabnzbd.initd
+++ b/net-nntp/sabnzbd/files/sabnzbd.initd
@@ -24,7 +24,7 @@ start() {
--group ${SABNZBD_GROUP} \
--pidfile "${PIDFILE}" \
--wait 1000 \
- --exec /usr/bin/sabnzbd \
+ --exec /usr/share/sabnzbd/SABnzbd.py \
-- \
--config-file "${SABNZBD_CONFIGFILE}" \
--logging "${SABNZBD_LOGGING}" \
diff --git a/net-nntp/sabnzbd/sabnzbd-1.1.1.ebuild b/net-nntp/sabnzbd/sabnzbd-1.1.1.ebuild
index 120ac64ced8..d013e87a479 100644
--- a/net-nntp/sabnzbd/sabnzbd-1.1.1.ebuild
+++ b/net-nntp/sabnzbd/sabnzbd-1.1.1.ebuild
@@ -79,17 +79,15 @@ src_prepare() {
src_install() {
local d
- dodir /usr/share/${PN}/sabnzbd
- insinto /usr/share/${PN}/
- doins SABnzbd.py
- fperms +x /usr/share/${PN}/SABnzbd.py
- dobin "${FILESDIR}"/sabnzbd
-
for d in cherrypy email icons interfaces locale po sabnzbd tools util; do
insinto /usr/share/${PN}/${d}
doins -r ${d}/*
done
+ insinto /usr/share/${PN}
+ insopts -m 0755
+ doins SABnzbd.py
+
python_optimize "${D}usr/share/${PN}"
newinitd "${FILESDIR}/${PN}.initd" "${PN}"