commit: 69e67d2d995c176b6bef8f45c47e8d60202f65be
Author: Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 10 18:10:38 2016 +0000
Commit: Matt Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Mon Oct 10 18:10:38 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=69e67d2d
dev-python/carbon: remove bashisms in init for bug 589084
Package-Manager: portage-2.3.0
dev-python/carbon/files/carbon.initd2 | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/dev-python/carbon/files/carbon.initd2
b/dev-python/carbon/files/carbon.initd2
index e7f1f1e..ff15097 100644
--- a/dev-python/carbon/files/carbon.initd2
+++ b/dev-python/carbon/files/carbon.initd2
@@ -5,13 +5,13 @@
export GRAPHITE_CONF_DIR=/etc/carbon
export GRAPHITE_STORAGE_DIR=/var/lib/carbon
-INSTANCE=${SVCNAME/#*.}
-if [ "${INSTANCE}" == "${SVCNAME}" ]; then
+INSTANCE=${SVCNAME#*.}
+if [ "${INSTANCE}" = "${SVCNAME}" ]; then
INSTANCE="a"
fi
PIDFILE="/var/run/${SVCNAME}.pid"
-PROGRAMNAME=${SVCNAME/.*}
+PROGRAMNAME=${SVCNAME%%.*}
CARBON_CONFIG=${CARBON_CONFIG:-/etc/carbon/carbon.conf}