Avoid bashisms in init script. Bug #482070 thanks to Johan Bergström <bugs@bergstroem.nu>

Package-Manager: portage-2.2.1/cvs/Linux x86_64
Manifest-Sign-Key: 0xC2BA7F3C!

3 files changed, 27 insertions, 15 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/Manifest b/app-admin/collectd/Manifest
index c313cf288b70..b1ebdbef2a91 100644
--- a/app-admin/collectd/Manifest
+++ b/app-admin/collectd/Manifest
@@ -15,7 +15,7 @@ AUX collectd-5.1.0-netlink.patch 714 SHA256 06eaaaa452da20d6d441a0a98108fa81b2ab
 AUX collectd-5.1.1-lt.patch 827 SHA256 c5af9d57d03f66a9651779c041847304e58464f3b680af8973411d126fae00ac SHA512 33dcddf3e1c094ce35c827d3f61cb6cdd8b6da49488a34055797b830e00d8abeff3aeaf0911dd1e100bb4d98479bef71c4f97cb94cafdd987721d1a921d1d17e WHIRLPOOL 327dbd1ccc1993fc21fdd651d021ac7cc794220b91e0f7811a3134b4a18d91dbf42f172dcec82b24bb8948e8095af3bd1fd7d4e128c9776f933af4ba15a1667d
 AUX collectd-5.1.1-perl-prefix.patch 1243 SHA256 54ca399fbfaaebbd1f19c0fcb1c4ce60630a8e98f8fa6148b47b099e0b217846 SHA512 32bc45a6c0cc7241ace2110d0db49c6651287df3ac210664ea69a50143ab4b3baf10635b8ba746e081e7a01a0690320d1efd05d72b65e450b82e5e475788bee3 WHIRLPOOL 278b183e7a8b48bd3a16d1f9f2f5dc14db484b86afd60a8b0315985f32f87ff6e5e745f677ded27e9cc566c1eff58ebff2116783ff7c7979009bd44218587864
 AUX collectd.confd 865 SHA256 c24b11a65cb25587aa534c529a2b394b7c190ac44e1849ea5e1bc02d1e0a1592 SHA512 4df752ec2af61dfbf7856c8ec09d299ab0db6ae6e1e223a6c65a4261f13cadd2d9d66f20ee307906dd1ed4ef184244aa323e80a0aba7c655970b1bf5a06992b3 WHIRLPOOL 0935d68ab660ed7ec63b9dd4a9287e88716a6665e5ac04b0b8e7dda468f29577e5014f69a6b42cafef5b19ae4fdf249625586dc579fcabd7ddcc5d65087c3bb9
-AUX collectd.initd 1649 SHA256 9db6809d7e7991208d35bc517c71d12a5fa8b8453f096a433e386259c7301163 SHA512 4a46e55c63933a762401c537a49a108c93ae6dc2b4e8576869f1b5b693fa822d68456d83fa72548a30e8775cd5d01c7ed3a1567336091d9622db3eec66fdcd1c WHIRLPOOL dcedcc3ec33fcc350232ee26f8d9a04b64808b450dd66e348b80501fb8b96f466a264782cf8e748d8653227ef8b307c8ebdcea9d816adadfcfaadb2c742269bb
+AUX collectd.initd 1639 SHA256 c92020f325a64b834272e3fab1fbdbd159d8e64d959ee93606dca5aa7949f57b SHA512 9df642feb31edcf91bc18489d12f38e460d64af11310a04f681a957a8d188adcc6cb38a9142f03e16f89b09903d5ed454563d040b5151b3710e6f0b8e2527f62 WHIRLPOOL 6f187e713937eb00007cca73a3a9f6ac820c3127071659abc508ac1e26a767f90b356f914e85e17367bb45b81692c724047dc4112b9c55db94e04b343d845801
 AUX logrotate 115 SHA256 eb359631805b6bfb9f2a9ae5ed21be8f8b3b6f1ffeed8d506231043c9a77262c SHA512 87ec01784d415f00834c2b20614f11f7e08b70f88d7c87509a8b8fd7e1af8758565b9ed6a6840af7bf1006cb941a61a6ff4f3176f6ded722728f24483b08bc8e WHIRLPOOL ba884cecfc7fc41e1fc8661d5e92c4519718ebddc4d919dd94d2183f377076efdad19f460ace810e1505cd2005bd64addf34306841993af9d754df633709a003
 DIST collectd-5.1.0.tar.bz2 1305538 SHA256 521d4be7df5bc1124b7b9ea88227e95839a5f7c1b704a5bde0f60f058ec6eecb SHA512 c107bdad66d90d6e299ba0da68cc0726e3b0541efd7d672687713f5a414765d2afbd66a8c834da36dafe201dc0ec97caf80844d5f0354503fa67fcbfe0d43725 WHIRLPOOL 3de7d344d622ac20cb63fc0ce78e5d18c7d57d52e76ea09a47fc58bc339cf1108baa521e142a3d386f56dbf7a83311f2f93489241f2061da90900617f1715e8c
 DIST collectd-5.1.1.tar.bz2 1331678 SHA256 0eeb8e45c83ba13fa00bd4f6875528e8a13769ba218205785d40b861489bf1fd SHA512 5d5f30ddb9ded3b48b64efdc1a4dbbbfe1601c16fc2450a7d1a1786493b12e01da66f23eca4d59853326b3c598b2fa9475f036e78e0d9e50b3f5ddd3a37c3c9b WHIRLPOOL 6a7256f1dc526bd0b6cb4c4845d511257c2c61c0de9c17ecff6751ad89698eb4127fe1cba4919920772bacd2a3c6966201ea162e61caf8e9f4e5baeaa0fb20e2
@@ -34,16 +34,24 @@ EBUILD collectd-5.2.1.ebuild 13115 SHA256 2edd8f6191e72f6cd758e355e6541f6e0cc6c1
 EBUILD collectd-5.2.2.ebuild 13115 SHA256 39cac44939fcbc02b952f2ac12c86c30596f0bb17c255ebaed3e009937b4c7ac SHA512 aa2a28783c703b24cedde8b39f8fb0a2d79c7bb7d79b227e0e54205d630adaac26ca64c2ff511fac41c71f26d3726f96e7ceede1a58b569c8c1be3f2256af540 WHIRLPOOL 4efe6734d1b2bfe2291fae9f7dd3f94245b8708f7f054fe2c8a791895c709f21f1537de8efd8ebc5b055c4259f0c3f26ce1f2e9606fd265436a6a40be7b86c84
 EBUILD collectd-5.3.0.ebuild 13165 SHA256 89eefa9b8458f6c21e186de9331919b992a08cdd0e406bd296b89d9f31b19d56 SHA512 8552f5247db92ce19cbce15a82c3656fbef46e3d2c21207389a465609376520b1b11f72324953be0b08ae42fdc85c2cdffa52c6099dbddac322e08e1c378cea5 WHIRLPOOL af3ca68d008ccde70b43602cb1cd01d8d7039eb34aa78663ca8694f859ad0920f2913ff05518a24c9ec60684f7c47122d2813cef0624ba12cc637ef5f6c4ac89
 EBUILD collectd-5.4.0.ebuild 13234 SHA256 91134ba00fee63a4b7b5d773f33d5b02323d443eecd798e2821e3d3009ea4bde SHA512 c9a5999ac73dd56ad90e15c096e9efb5474459cb1e2aa6b1a243fc266aea61aa3fbcf76772effa31e5097a2b1644be50ea23290797528cd08efd6181531b6559 WHIRLPOOL c13dccab3def73e30ec08e6bc7003edb78cd4c61f2606658eded6e397937eb6da198bbe1587aa884bfd9cba2e66d7644e85a203d845b80e8aa673b89f35cc162
-MISC ChangeLog 11005 SHA256 a37520d9dae8e4d902e332613c5159ea53fe11cfbd1fe78e1a2403277e1f92ba SHA512 e24d9ad6746713d73f479d1892a672c2e050c1cfc6171df28b773aa6210ab62fd5a9d0af18587b597a5eaf07512ec67eb553a2d2257f475a0d5ff9c4d40c5943 WHIRLPOOL a908884fc64208de5d1044535da1b669aa2db1cd9ea413f70e73c26e2fab2e2c99bc90d6cabade494b3ade6f27281ce72a24f699319c8e88cbacbd042c1fec97
+MISC ChangeLog 11178 SHA256 0c0720c2e8d24153ebb0ec81d3d6830218603a2c3eb4fa2263a4b18742664cb0 SHA512 8a2b8f137bd378e369609caa69ba3bbc8314be1482eff8e1ba2a8cbbcc7a9f7d55dbfc6165fb8b6f092cd9c388655b71f36597ecc517513d860b07e475d87a26 WHIRLPOOL 738c3f40fbff3ae405b70dc849c8614fed700a17463d59f3f5a14b58e540019c8b1db809c28bd10e7c8da7edb215669b64ec450ce631ec916b6f3c91c57f433f
 MISC metadata.xml 13489 SHA256 81de8a64ff73bf93b53bd8f8dbbffa350a4ce29be3f398a5ae0dc4e5bb631421 SHA512 9ee82a3ae16ee851d22b9843793b976851fc9beb98a1a98645a0af8e2fa7957258e4462dc3a4f41d96091ffea43e489b6884293d1e4f3f851e9d53d80cf0c097 WHIRLPOOL 82a3c44d991e4d625bac58636f9a6ba53095f25ec6125bc89e82812844c98fbc484aa35bcbc591dbd4a1eed573730057da92ac49e0c18e3c1f9ba2f46aca4d20
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.21 (GNU/Linux)
 
-iQEcBAEBCAAGBQJSFd0mAAoJEJWyH81tNOV9r5MH/1TSDoG8lo6GXlLj9xicXTvM
-a4ICdwahSE3icWTXpWpsYNoUElERg+P0S8j1Ji6zy4un1gAkptUXSJ+stDg/dRJC
-eRnWvNHyVU8EUrFv7zzpFyimc+ovPYk1OmnDZwQ2E+f65jmkm672kM89YBHxo/47
-70QY4dXmkXOa2MQ+WMTxPmEdBhBJYvyvilX6yJ4qFY86WdigkCwA+qgW9AxVlZRF
-bb2eV+ylprsht7F/a2eRWhItZkVoGS18LjSHrfjtiQ5Jy53lX4YByhza077YALBY
-2aiNCLBt7x0vGM8aKUSxTC8yUQSzJf2cG7BZRLhvR1RKO7Nmx1sR92/XXCyTIto=
-=/jsX
+iQJ8BAEBCABmBQJSLIphXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzNTVDNDczOUYzRjJEMTRGNDRGMzU2RkMw
+OUJGNEY1NEMyQkE3RjNDAAoJEAm/T1TCun88SzkP/144hNlpq68zafjEHP+O8lVo
+aUdIo1GodbLoaz8HN7FmGTj3vyvT+b65Hd8QUElwHL2dSEOOUNSmy5TVIdTV0OaL
+nac14qZfNpyJI6aYukJ0wlgtp1YNjp+R9W2b/xJFCHR4WvbjqeSYz0X7+dH0i9Jq
+D4yDilVUNer0hsWO3jxDw8rgP/V6dVHLDEYmZfsocSAI4HlXMrlcatcAdigZ3RYc
+0p4vfPcUidXKUfKVgcNqaOXpDbaRhfExQkbgGzOk9w6v8llAT1OwS+sIzjTQG33E
+dQVosZQeD4FRmH0B96G/6lNvyNx7aanAzcKLwzT6IyuORru9+ZB24CEsdZZ008F2
+jRSxvgOHu8iJnfF9BTk+9Qf233B8s7CJPwnb3dRk/q+TFt8/ESZBQPcL3N+kdaB1
++s4c1qctUHQE23z+tDa1rFa3WF/aM/02P3VAdSqJuVBPygqTEDtVSp4mGvtxzgid
+/fha7+WtncnkPMB521+pCKqbPP1+Mrb1Wm46wknGVZeKRzM2ETKs6qNI4mt1NiKk
+qZRoRCAfqgGDj5ak8c/KUwxrSUhM5Hli9OEYZmudlDGhfq5EhejgB9ZPz6UomTyP
+zQQ7X1FMmb3+ReoRMk1LJhMdZtW09iB2bOE/0b22LMoLsW3IWoc97H0454cYo17D
+wqWjqObH5LQWh9xYS8KO
+=keOJ
 -----END PGP SIGNATURE-----
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