Gentoo Archives: gentoo-commits

From: Matt Thode <prometheanfire@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/carbon/files/
Date: Mon, 10 Oct 2016 18:11:12
Message-Id: 1476123038.69e67d2d995c176b6bef8f45c47e8d60202f65be.prometheanfire@gentoo
1 commit: 69e67d2d995c176b6bef8f45c47e8d60202f65be
2 Author: Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
3 AuthorDate: Mon Oct 10 18:10:38 2016 +0000
4 Commit: Matt Thode <prometheanfire <AT> gentoo <DOT> org>
5 CommitDate: Mon Oct 10 18:10:38 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=69e67d2d
7
8 dev-python/carbon: remove bashisms in init for bug 589084
9
10 Package-Manager: portage-2.3.0
11
12 dev-python/carbon/files/carbon.initd2 | 6 +++---
13 1 file changed, 3 insertions(+), 3 deletions(-)
14
15 diff --git a/dev-python/carbon/files/carbon.initd2 b/dev-python/carbon/files/carbon.initd2
16 index e7f1f1e..ff15097 100644
17 --- a/dev-python/carbon/files/carbon.initd2
18 +++ b/dev-python/carbon/files/carbon.initd2
19 @@ -5,13 +5,13 @@
20 export GRAPHITE_CONF_DIR=/etc/carbon
21 export GRAPHITE_STORAGE_DIR=/var/lib/carbon
22
23 -INSTANCE=${SVCNAME/#*.}
24 -if [ "${INSTANCE}" == "${SVCNAME}" ]; then
25 +INSTANCE=${SVCNAME#*.}
26 +if [ "${INSTANCE}" = "${SVCNAME}" ]; then
27 INSTANCE="a"
28 fi
29
30 PIDFILE="/var/run/${SVCNAME}.pid"
31 -PROGRAMNAME=${SVCNAME/.*}
32 +PROGRAMNAME=${SVCNAME%%.*}
33
34 CARBON_CONFIG=${CARBON_CONFIG:-/etc/carbon/carbon.conf}