From: "Justin Bronder" <jsbronder@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: net-nntp/sabnzbd/, net-nntp/sabnzbd/files/
Date: Sat, 19 Nov 2016 16:34:10 +0000 (UTC) [thread overview]
Message-ID: <1479573192.23150df6ad2364e1d4de4438f8ef1379c20257c9.jsbronder@gentoo> (raw)
commit: 23150df6ad2364e1d4de4438f8ef1379c20257c9
Author: Michał Kępień <github <AT> kempniu <DOT> pl>
AuthorDate: Fri Nov 18 20:02:05 2016 +0000
Commit: Justin Bronder <jsbronder <AT> gentoo <DOT> org>
CommitDate: Sat Nov 19 16:33:12 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=23150df6
Drop custom wrapper script
net-nntp/sabnzbd/files/sabnzbd | 14 --------------
net-nntp/sabnzbd/files/sabnzbd.initd | 2 +-
net-nntp/sabnzbd/sabnzbd-1.1.1.ebuild | 10 ++++------
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 ccc1a67..00000000
--- 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 ad11573..a2a8407 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 120ac64..d013e87 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}"
next reply other threads:[~2016-11-19 16:34 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-11-19 16:34 Justin Bronder [this message]
-- strict thread matches above, loose matches on Subject: below --
2017-04-26 13:13 [gentoo-commits] repo/gentoo:master commit in: net-nntp/sabnzbd/, net-nntp/sabnzbd/files/ Justin Bronder
2020-06-28 12:59 Thomas Deutschmann
2023-02-20 18:05 Michał Górny
2023-07-24 15:05 Michał Górny
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1479573192.23150df6ad2364e1d4de4438f8ef1379c20257c9.jsbronder@gentoo \
--to=jsbronder@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox