Make init script compatible with POSIX shells, thanks to Fabrizio Montesi <famontesi@gmail.com> (#204729).

Package-Manager: portage-2.1.3.19

3 files changed, 26 insertions, 20 deletions

diff --git a/net-proxy/polipo/ChangeLog b/net-proxy/polipo/ChangeLog
index f2917671c2b9..138740a12d95 100644
--- a/net-proxy/polipo/ChangeLog
+++ b/net-proxy/polipo/ChangeLog
@@ -1,10 +1,18 @@
 # ChangeLog for net-proxy/polipo
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/polipo/ChangeLog,v 1.26 2008/01/01 16:14:43 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/polipo/ChangeLog,v 1.27 2008/01/07 20:17:04 mrness Exp $
+
+  07 Jan 2008; Alin Năstac <mrness@gentoo.org> files/polipo.initd:
+  Make init script compatible with POSIX shells, thanks to Fabrizio Montesi
+  <famontesi@gmail.com> (#204729).
 
   01 Jan 2008; Markus Meier <maekke@gentoo.org> polipo-1.0.3.ebuild:
   x86 stable, bug #203753
 
+  07 Jan 2008; Alin Năstac <mrness@gentoo.org> files/polipo.initd:
+  Make init script compatible with POSIX shells, thanks to Fabrizio Montesi
+  <famontesi@gmail.com> (#204729).
+
   04 Nov 2007; Alin Năstac <mrness@gentoo.org> polipo-1.0.2-r1.ebuild,
   polipo-1.0.3.ebuild:
   Remove useless pkg_preinst function.
diff --git a/net-proxy/polipo/Manifest b/net-proxy/polipo/Manifest
index 0dc43befef6b..1299ff772869 100644
--- a/net-proxy/polipo/Manifest
+++ b/net-proxy/polipo/Manifest
@@ -9,10 +9,10 @@ AUX polipo.crond 234 RMD160 463895559a9d28d38bc11064cdab7882a56128e6 SHA1 59a70f
 MD5 e5ef4a8d1d756db7687c7bafe3e846f3 files/polipo.crond 234
 RMD160 463895559a9d28d38bc11064cdab7882a56128e6 files/polipo.crond 234
 SHA256 cab7448361658d34593822893688df11d6f02f8b2927dbbbbe84642b335575d0 files/polipo.crond 234
-AUX polipo.initd 1357 RMD160 f07a38b41e627665025b1f1102de7c8ab11e89f0 SHA1 492d5a612211023d1bc52a218ae5f49541c7cd20 SHA256 b66110d4cb0feb35323d004f5a9a2efe5e81c87847927bd96135d21505aca021
-MD5 ff9f18cb46b9cdf54e9ef9c64c6a4944 files/polipo.initd 1357
-RMD160 f07a38b41e627665025b1f1102de7c8ab11e89f0 files/polipo.initd 1357
-SHA256 b66110d4cb0feb35323d004f5a9a2efe5e81c87847927bd96135d21505aca021 files/polipo.initd 1357
+AUX polipo.initd 1306 RMD160 498db8de10f45c6f3203b0453f1cd1b7e3acdd1e SHA1 4a55eed27203227af1882c9ac6cff4ef5ee7a8c7 SHA256 77944c5fc6c85b3b619d5436e5b8bfcb1e30f459f8293efef0e5b685ef7573d0
+MD5 931aff867ea78c8830f7bbe92be4ab9f files/polipo.initd 1306
+RMD160 498db8de10f45c6f3203b0453f1cd1b7e3acdd1e files/polipo.initd 1306
+SHA256 77944c5fc6c85b3b619d5436e5b8bfcb1e30f459f8293efef0e5b685ef7573d0 files/polipo.initd 1306
 DIST polipo-1.0.2.tar.gz 177584 RMD160 7e934fb7a8ffd62627fe93661fecbcec74285f80 SHA1 2097a2b3733229010621d4ecdc3f57e3cbf95d16 SHA256 796c5fec2276029e3f1ac6c6fc5abddf35eb24f10cb8b2dba04f91923ca8b0b0
 DIST polipo-1.0.3.tar.gz 180349 RMD160 297b67d302ce12e85f7f3c4b29a2dd79379edbdd SHA1 9cc780b9d8b0ad09b6ebbd71a87194f3373f1fae SHA256 85ace9fba0c6339384b0f4ef815565d4d63f3ba40991d34ed7e26bbbcdbde09d
 EBUILD polipo-1.0.2-r1.ebuild 1141 RMD160 7684516478e3b96670f9b2a398ef6c9f3efbb449 SHA1 a06ba9f82113170f0c59eb044ee7e55238062f31 SHA256 6fd91f2d7c154b851578fe32eb57d11f59027b3bf38e940089f7fcc6b885252b
@@ -23,10 +23,10 @@ EBUILD polipo-1.0.3.ebuild 1177 RMD160 0233b1381647bf40a2ee93de8403b2fe70d21ba5
 MD5 0dce5b24768f552c272615a3365a8d5b polipo-1.0.3.ebuild 1177
 RMD160 0233b1381647bf40a2ee93de8403b2fe70d21ba5 polipo-1.0.3.ebuild 1177
 SHA256 e22256ba6866b8e790310e00a7bb8ce8c64d331a3c7cd19ac242be19a6e7a1dd polipo-1.0.3.ebuild 1177
-MISC ChangeLog 4699 RMD160 cd90fde688591902725db944da90d6f935b50f97 SHA1 e92e514ec50e5e574cce64437af9687f61eadabb SHA256 1d8d575f34b74a3707d85d3486b80ef8a1fd4c7f5444dd4b76217aa15ad06ac3
-MD5 fd3679e876e3dc13cae61d1e25add200 ChangeLog 4699
-RMD160 cd90fde688591902725db944da90d6f935b50f97 ChangeLog 4699
-SHA256 1d8d575f34b74a3707d85d3486b80ef8a1fd4c7f5444dd4b76217aa15ad06ac3 ChangeLog 4699
+MISC ChangeLog 5059 RMD160 05e9af24eb595bdad0ae9904c949ebfd55c51c0d SHA1 0d5fca79df210d0a0123356f3022a465fb8d0b14 SHA256 d8585b9c744e6c4f59f53bbdbe3431ab3d5cc1cdfa26b8b55fedc67ebcbda741
+MD5 d1fabf1d3a2c5264ec169263a98c7099 ChangeLog 5059
+RMD160 05e9af24eb595bdad0ae9904c949ebfd55c51c0d ChangeLog 5059
+SHA256 d8585b9c744e6c4f59f53bbdbe3431ab3d5cc1cdfa26b8b55fedc67ebcbda741 ChangeLog 5059
 MISC metadata.xml 294 RMD160 9030115eb77480c879cc1b05acf92e90c9825330 SHA1 05e93a9bb94da1af1f7ac486d280d82dc68664fc SHA256 86f147ccac4c6a157b8e94ac26c69c07db91b435bb0ec703a332c17c1f3d1c1a
 MD5 c3de0bbc117c44cd0aad81e19a01094c metadata.xml 294
 RMD160 9030115eb77480c879cc1b05acf92e90c9825330 metadata.xml 294
@@ -40,7 +40,7 @@ SHA256 04f7a209c2c160735361ebfa4fbeb4c712082455fcbc8720463145d9147fc751 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.8 (GNU/Linux)
 
-iEYEARECAAYFAkd6Zz0ACgkQkKaRLQcq0GILUACePUxk/C2BGCe5YhEaemtiqAkB
-EikAoJefQj3MMSR6vC/v8NtwTYhk8eqP
-=Xpxb
+iEYEARECAAYFAkeCiMsACgkQ+fWpoTWIA9Hl/gCfYuVs1O1K44uw6yV8IORgt4cI
+ilcAoIuBt3epvpnqf/ROGdsjkCPmA7sV
+=6gih
 -----END PGP SIGNATURE-----
diff --git a/net-proxy/polipo/files/polipo.initd b/net-proxy/polipo/files/polipo.initd
index de3532133ee4..8742a9778e59 100644
--- a/net-proxy/polipo/files/polipo.initd
+++ b/net-proxy/polipo/files/polipo.initd
@@ -1,32 +1,32 @@
 #!/sbin/runscript
 # Copyright 1999-2005 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/polipo/files/polipo.initd,v 1.4 2007/06/17 07:00:10 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/polipo/files/polipo.initd,v 1.5 2008/01/07 20:17:04 mrness Exp $
 
 depend() {
 	need net
 }
 
 checkconfig() {
-	polipo -v | (
+	{ polipo -v || return 1 ; } | {
 		local retvalue=0
 		local name type value desc
 		while read name type value desc ; do
 			case ${name} in
 				configFile)
-					if [[ "${value}" == "(none)" ]]; then
+					if [ "${value}" = "(none)" ] ; then
 						eerror "Unable to read configuration file /etc/polipo/config"
 						retvalue=1
 					fi
 					;;
 				daemonise)
-					if [[ "${value}" != "false" ]]; then
+					if [ "${value}" != "false" ] ; then
 						eerror "Configuration option not supported by this init script: ${name}=${value}"
 						retvalue=1
 					fi
 					;;
 				pidFile)
-					if [[ "${value}" != "(none)" ]]; then
+					if [ "${value}" != "(none)" ] ; then
 						eerror "Configuration option not supported by this init script: ${name}=${value}"
 						retvalue=1
 					fi
@@ -34,9 +34,7 @@ checkconfig() {
 			esac
 		done
 		return ${retvalue}
-	)
-	[[ ${PIPESTATUS[0]} == 0 && ${PIPESTATUS[1]} == 0 ]]
-	return $?
+	}
 }
 
 start() {