diff options
| author |   Tiziano Müller <dev-zero@gentoo.org> | 2008-09-29 12:48:32 +0000 |
|---|---|---|
| committer | Tiziano Müller <dev-zero@gentoo.org> | 2008-09-29 12:48:32 +0000 |
| commit | 566eb993dc29803557514072cfb5485cf4a09877 (patch) | |
| tree | 1418f12d97da3d91d26dcd27298016fac7982073 /app-admin | |
| parent | Add ~amd64 keyword (diff) | |
| download | gentoo-2-566eb993dc29803557514072cfb5485cf4a09877.tar.gz gentoo-2-566eb993dc29803557514072cfb5485cf4a09877.tar.bz2 gentoo-2-566eb993dc29803557514072cfb5485cf4a09877.zip | |
Removed bashism from init-scripts
(Portage version: 2.2_rc11/cvs/Linux 2.6.27-rc6 x86_64)
Diffstat (limited to 'app-admin')
| -rw-r--r-- | app-admin/puppet/ChangeLog | 6 | ||||
| -rwxr-xr-x | app-admin/puppet/files/puppet.init | 4 | ||||
| -rwxr-xr-x | app-admin/puppet/files/puppetmaster.init | 10 |
3 files changed, 12 insertions, 8 deletions
diff --git a/app-admin/puppet/ChangeLog b/app-admin/puppet/ChangeLog index dd60f12090a9..47b9603ce7a0 100644 --- a/app-admin/puppet/ChangeLog +++ b/app-admin/puppet/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-admin/puppet # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/ChangeLog,v 1.24 2008/09/27 10:40:26 bluebird Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/ChangeLog,v 1.25 2008/09/29 12:48:31 dev-zero Exp $ + + 29 Sep 2008; Tiziano Müller <dev-zero@gentoo.org> files/puppet.init, + files/puppetmaster.init: + Removed bashism from init-scripts 27 Sep 2008; Friedrich Oslage <bluebird@gentoo.org> puppet-0.24.5-r2.ebuild: diff --git a/app-admin/puppet/files/puppet.init b/app-admin/puppet/files/puppet.init index e909f88aa6e7..afdf5dc7f824 100755 --- a/app-admin/puppet/files/puppet.init +++ b/app-admin/puppet/files/puppet.init @@ -8,7 +8,7 @@ depend() { } checkconfig() { - if [[ ! -d "${PUPPET_PID_DIR}" ]] ; then + if [ ! -d "${PUPPET_PID_DIR}" ] ; then eerror "Please make sure PUPPET_PID_DIR is defined and points to a existing directory" return 1 fi @@ -20,7 +20,7 @@ start() { checkconfig || return $? local options="" - [[ -n "${PUPPET_EXTRA_OPTS}" ]] && options="${options} ${PUPPET_EXTRA_OPTS}" + [ -n "${PUPPET_EXTRA_OPTS}" ] && options="${options} ${PUPPET_EXTRA_OPTS}" ebegin "Starting puppet" start-stop-daemon --start --quiet \ diff --git a/app-admin/puppet/files/puppetmaster.init b/app-admin/puppet/files/puppetmaster.init index 4cc59794ba84..992a47e9dc6e 100755 --- a/app-admin/puppet/files/puppetmaster.init +++ b/app-admin/puppet/files/puppetmaster.init @@ -10,13 +10,13 @@ depend() { } checkconfig() { - if [[ ! -d "${PUPPETMASTER_PID_DIR}" ]] ; then + if [ ! -d "${PUPPETMASTER_PID_DIR}" ] ; then eerror "Please make sure PUPPETMASTER_PID_DIR is defined and points to a existing directory" return 1 fi local site_manifest="/etc/puppet/manifests/site.pp" - [[ -n "${PUPPETMASTER_MANIFEST}" ]] && site_manifest="${PUPPETMASTER_MANIFEST}" + [ -n "${PUPPETMASTER_MANIFEST}" ] && site_manifest="${PUPPETMASTER_MANIFEST}" if [ ! -f "${site_manifest}" ] ; then eerror "Please create ${site_manifest} before running puppet" @@ -30,9 +30,9 @@ start() { checkconfig || return $? local options="" - [[ -n "${PUPPETMASTER_MANIFEST}" ]] && options="${options} --manifest=${PUPPETMASTER_MANIFEST}" - [[ -n "${PUPPETMASTER_LOG}" ]] && options="${options} --logdest=${PUPPETMASTER_LOG}" - [[ -n "${PUPPETMASTER_EXTRA_OPTS}" ]] && options="${options} ${PUPPETMASTER_EXTRA_OPTS}" + [ -n "${PUPPETMASTER_MANIFEST}" ] && options="${options} --manifest=${PUPPETMASTER_MANIFEST}" + [ -n "${PUPPETMASTER_LOG}" ] && options="${options} --logdest=${PUPPETMASTER_LOG}" + [ -n "${PUPPETMASTER_EXTRA_OPTS}" ] && options="${options} ${PUPPETMASTER_EXTRA_OPTS}" ebegin "Starting puppetmaster" start-stop-daemon --start --quiet \ |