diff options
| author |   Markos Chandras <hwoarang@gentoo.org> | 2013-09-08 14:33:07 +0000 |
|---|---|---|
| committer | Markos Chandras <hwoarang@gentoo.org> | 2013-09-08 14:33:07 +0000 |
| commit | c7cc89a6b7ab4ca5f6bb3e19ff7691a4bc8a9dd3 (patch) | |
| tree | f58edc92da51309a19d001d0f71f481bde8ad51e /app-admin | |
| parent | Fix CRLF by eponymous (bug #484236). (diff) | |
| download | gentoo-2-c7cc89a6b7ab4ca5f6bb3e19ff7691a4bc8a9dd3.tar.gz gentoo-2-c7cc89a6b7ab4ca5f6bb3e19ff7691a4bc8a9dd3.tar.bz2 gentoo-2-c7cc89a6b7ab4ca5f6bb3e19ff7691a4bc8a9dd3.zip | |
Avoid bashisms in init script. Bug #482070 thanks to Johan Bergström <bugs@bergstroem.nu>
(Portage version: 2.2.1/cvs/Linux x86_64, signed Manifest commit with key C2BA7F3C!)
Diffstat (limited to 'app-admin')
| -rw-r--r-- | app-admin/collectd/ChangeLog | 6 | ||||
| -rw-r--r-- | app-admin/collectd/files/collectd.initd | 10 |
2 files changed, 10 insertions, 6 deletions
diff --git a/app-admin/collectd/ChangeLog b/app-admin/collectd/ChangeLog index 8ed91c501984..fb32d2757380 100644 --- a/app-admin/collectd/ChangeLog +++ b/app-admin/collectd/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-admin/collectd # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/collectd/ChangeLog,v 1.54 2013/08/22 09:42:58 tomwij Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/collectd/ChangeLog,v 1.55 2013/09/08 14:33:07 hwoarang Exp $ + + 08 Sep 2013; Markos Chandras <hwoarang@gentoo.org> files/collectd.initd: + Avoid bashisms in init script. Bug #482070 thanks to Johan Bergström + <bugs@bergstroem.nu> *collectd-5.4.0 (22 Aug 2013) diff --git a/app-admin/collectd/files/collectd.initd b/app-admin/collectd/files/collectd.initd index 1dd6e513d80e..399227746da7 100644 --- a/app-admin/collectd/files/collectd.initd +++ b/app-admin/collectd/files/collectd.initd @@ -1,7 +1,7 @@ #!/sbin/runscript -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/collectd/files/collectd.initd,v 1.6 2012/02/07 20:12:03 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/collectd/files/collectd.initd,v 1.7 2013/09/08 14:33:06 hwoarang Exp $ : ${COLLECTD_PIDFILE:='/var/run/collectd/collectd.pid'} : ${COLLECTD_CFGFILE:='/etc/collectd.conf'} @@ -21,9 +21,9 @@ configtest() { } checkconfig() { - if [[ $(sed '/^$\|^#/d' ${COLLECTD_CFGFILE} | grep -c 'LoadPlugin\w\+oracle') != 0 ]] ; then - if [[ -e /etc/env.d/50oracle-instantclient-basic ]] ; then - source /etc/env.d/50oracle-instantclient-basic + if [ $(sed '/^$\|^#/d' ${COLLECTD_CFGFILE} | grep -c 'LoadPlugin\w\+oracle') != 0 ] ; then + if [ -e /etc/env.d/50oracle-instantclient-basic ] ; then + . /etc/env.d/50oracle-instantclient-basic export ORACLE_HOME export TNS_ADMIN else |