made init-script compatible with shells other than bash (bug #194919), changed einfo to elog in pkg_postinst, some other minor cleanups.

Package-Manager: portage-2.1.3.12

4 files changed, 53 insertions, 49 deletions

diff --git a/net-dns/ez-ipupdate/ChangeLog b/net-dns/ez-ipupdate/ChangeLog
index 5f3f5c2d95ec..1b65dc3fefba 100644
--- a/net-dns/ez-ipupdate/ChangeLog
+++ b/net-dns/ez-ipupdate/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-dns/ez-ipupdate
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/ez-ipupdate/ChangeLog,v 1.22 2007/10/06 19:30:37 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/ez-ipupdate/ChangeLog,v 1.23 2007/10/07 16:38:52 sbriesen Exp $
+
+  07 Oct 2007; Stefan Briesenick <sbriesen@gentoo.org>
+  files/ez-ipupdate.initd, ez-ipupdate-3.0.11_beta8-r4.ebuild:
+  made init-script compatible with shells other than bash (bug #194919),
+  changed einfo to elog in pkg_postinst, some other minor cleanups.
 
   06 Oct 2007; Tobias Scherbaum <dertobi123@gentoo.org>
   ez-ipupdate-3.0.11_beta8-r4.ebuild:
diff --git a/net-dns/ez-ipupdate/Manifest b/net-dns/ez-ipupdate/Manifest
index d614db2a5b44..99f9e4a387b6 100644
--- a/net-dns/ez-ipupdate/Manifest
+++ b/net-dns/ez-ipupdate/Manifest
@@ -10,10 +10,10 @@ AUX ez-ipupdate-3.0.11_beta8-syslog.patch 300 RMD160 518a93e2e1add19895cc88a1e88
 MD5 a4f8cd6940114080f701918bd00b1800 files/ez-ipupdate-3.0.11_beta8-syslog.patch 300
 RMD160 518a93e2e1add19895cc88a1e88b332db5d04394 files/ez-ipupdate-3.0.11_beta8-syslog.patch 300
 SHA256 d938f6366aa9fd71259f2ad909a0959ddb6160bcfe97d71d2cf0f3adbaece548 files/ez-ipupdate-3.0.11_beta8-syslog.patch 300
-AUX ez-ipupdate.initd 2674 RMD160 0b255340f9e7a0cba27e943be5b91fc8a586e14c SHA1 fc94414562ed1172ee7598fe9eed593e3a57eb16 SHA256 48e961f3238b26eba42462d0b034d31612869cafa81750aafc28b5dbaf32c97b
-MD5 a86839d37a016b07b2fb535f98d21b6a files/ez-ipupdate.initd 2674
-RMD160 0b255340f9e7a0cba27e943be5b91fc8a586e14c files/ez-ipupdate.initd 2674
-SHA256 48e961f3238b26eba42462d0b034d31612869cafa81750aafc28b5dbaf32c97b files/ez-ipupdate.initd 2674
+AUX ez-ipupdate.initd 2660 RMD160 9df544e6d6e93f2938438906d475f606bbfa0246 SHA1 d0cb27d3a5f4c7f08ee954526cda81975cf05d88 SHA256 0cedee45e46cfd2e6ee3ebb5a30fe2f1a39d550d580c91d29f5b1a3f2a61577c
+MD5 f5798d98211a961d0f82e5cff086ca45 files/ez-ipupdate.initd 2660
+RMD160 9df544e6d6e93f2938438906d475f606bbfa0246 files/ez-ipupdate.initd 2660
+SHA256 0cedee45e46cfd2e6ee3ebb5a30fe2f1a39d550d580c91d29f5b1a3f2a61577c files/ez-ipupdate.initd 2660
 AUX ez-ipupdate.rc6 1226 RMD160 c1620048a471f4b721acf44bb5b5899b336f27a1 SHA1 3370b2d918a12d69d8a80093746a24894da02ea3 SHA256 cbf7934f767fddd4cb8a49e632f56fc05769a0c352cadee03552b7f64ce4aec4
 MD5 cce1451ebc90d2c8a8068f6fe7d7a875 files/ez-ipupdate.rc6 1226
 RMD160 c1620048a471f4b721acf44bb5b5899b336f27a1 files/ez-ipupdate.rc6 1226
@@ -34,14 +34,14 @@ EBUILD ez-ipupdate-3.0.11_beta8-r3.ebuild 2864 RMD160 3f0289bacf733c071c52394ab1
 MD5 d4eb1119f83b937fd3be13137be91447 ez-ipupdate-3.0.11_beta8-r3.ebuild 2864
 RMD160 3f0289bacf733c071c52394ab13ea2324c4ec60e ez-ipupdate-3.0.11_beta8-r3.ebuild 2864
 SHA256 6e5dd325f625c512d57634f0c5631cce5f853dd89c02b6f3fc5288d3d3bb466b ez-ipupdate-3.0.11_beta8-r3.ebuild 2864
-EBUILD ez-ipupdate-3.0.11_beta8-r4.ebuild 2900 RMD160 78a7be87cb739db96ebf89a59e75534e0f639c2d SHA1 e97cb82722522b9ef81bbd3891f23a2c8558ad1a SHA256 f85ed34a548ae6c1a29f7773bc1ce86c2033751ee2540fc9b3d738cf069d370a
-MD5 0a373869e91bc4eebda75db447bb84fa ez-ipupdate-3.0.11_beta8-r4.ebuild 2900
-RMD160 78a7be87cb739db96ebf89a59e75534e0f639c2d ez-ipupdate-3.0.11_beta8-r4.ebuild 2900
-SHA256 f85ed34a548ae6c1a29f7773bc1ce86c2033751ee2540fc9b3d738cf069d370a ez-ipupdate-3.0.11_beta8-r4.ebuild 2900
-MISC ChangeLog 3918 RMD160 3e4ef924475a51d5c5a8e82bd6897fbcc73c5d32 SHA1 729b30294e22d2a198d232a8deac8d96e8888c94 SHA256 518d739c1eb4d9c3fd2e8174307c07f1caf5de097a77fbec3952900c9ceb2821
-MD5 54ce7888aea5ff227215a3defb000694 ChangeLog 3918
-RMD160 3e4ef924475a51d5c5a8e82bd6897fbcc73c5d32 ChangeLog 3918
-SHA256 518d739c1eb4d9c3fd2e8174307c07f1caf5de097a77fbec3952900c9ceb2821 ChangeLog 3918
+EBUILD ez-ipupdate-3.0.11_beta8-r4.ebuild 2863 RMD160 8f446e91e191c29d4687059ea5e2c585e7fcda04 SHA1 91f33f75dab9161446bd6c0f758cea1b9aaef1ad SHA256 452d978e79ce0c18c7120f69af32091d9763347498a51dd66b84f8ccdf65d80f
+MD5 66a00cc56b2edb0b2c620b2d06431a05 ez-ipupdate-3.0.11_beta8-r4.ebuild 2863
+RMD160 8f446e91e191c29d4687059ea5e2c585e7fcda04 ez-ipupdate-3.0.11_beta8-r4.ebuild 2863
+SHA256 452d978e79ce0c18c7120f69af32091d9763347498a51dd66b84f8ccdf65d80f ez-ipupdate-3.0.11_beta8-r4.ebuild 2863
+MISC ChangeLog 4176 RMD160 5ea095cc9ce04d1a6efac9cd252fc7f407e9f544 SHA1 0727fe2e3cee317d3b48899ae9a2b443ffaa5354 SHA256 5e34d6b570b5f5e32af802260e93d37989bb381184d2b35ea22a1f04bf3233d1
+MD5 db2585b9d59914d0bd127cffd0a43fd4 ChangeLog 4176
+RMD160 5ea095cc9ce04d1a6efac9cd252fc7f407e9f544 ChangeLog 4176
+SHA256 5e34d6b570b5f5e32af802260e93d37989bb381184d2b35ea22a1f04bf3233d1 ChangeLog 4176
 MISC metadata.xml 497 RMD160 92b0aae309f59fbe7ae0c6359355aa2abf0308a9 SHA1 203ae4e8d9abea53e4c54ee8dfa8594737991dfa SHA256 9d9ae7d8782c5eedfef88238baa233c1c2ed7c6832ba7ed6a6328bddf41699ba
 MD5 414df12ae436dd1300fe77e5549da485 metadata.xml 497
 RMD160 92b0aae309f59fbe7ae0c6359355aa2abf0308a9 metadata.xml 497
diff --git a/net-dns/ez-ipupdate/ez-ipupdate-3.0.11_beta8-r4.ebuild b/net-dns/ez-ipupdate/ez-ipupdate-3.0.11_beta8-r4.ebuild
index 60c9f27d00e3..e950f7df41b9 100644
--- a/net-dns/ez-ipupdate/ez-ipupdate-3.0.11_beta8-r4.ebuild
+++ b/net-dns/ez-ipupdate/ez-ipupdate-3.0.11_beta8-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/ez-ipupdate/ez-ipupdate-3.0.11_beta8-r4.ebuild,v 1.4 2007/10/06 19:30:37 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/ez-ipupdate/ez-ipupdate-3.0.11_beta8-r4.ebuild,v 1.5 2007/10/07 16:38:52 sbriesen Exp $
 
 inherit eutils
 
@@ -38,7 +38,7 @@ src_compile() {
 }
 
 src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
+	emake DESTDIR="${D}" install || die "emake install failed"
 	newinitd "${FILESDIR}/ez-ipupdate.initd" ez-ipupdate
 	keepdir /etc/ez-ipupdate /var/cache/ez-ipupdate
 
@@ -62,40 +62,39 @@ pkg_postinst() {
 	chmod 750 /etc/ez-ipupdate /var/cache/ez-ipupdate
 	chown ez-ipupd:ez-ipupd /etc/ez-ipupdate /var/cache/ez-ipupdate
 
-	einfo
-	einfo "Please create one or more config files in"
-	einfo "/etc/ez-ipupdate/. A bunch of samples can"
-	einfo "be found in the doc directory."
-	einfo
-	einfo "All config files must have a '.conf' extension."
-	einfo
-	einfo "Please do not use the 'run-as-user', 'run-as-euser',"
-	einfo "'cache-file' and 'pidfile' options, since these are"
-	einfo "handled internally by the init-script!"
-	einfo
-	einfo "If you want to use ez-ipupdate in daemon mode,"
-	einfo "please add 'daemon' to the config file(s) and"
-	einfo "add the ez-ipupdate init-script to the default"
-	einfo "runlevel."
-	einfo
-	einfo "Without the 'daemon' option, you can run the"
-	einfo "init-script with the 'update' parameter inside"
-	einfo "your PPP ip-up script."
-	einfo
+	elog
+	elog "Please create one or more config files in"
+	elog "/etc/ez-ipupdate/. A bunch of samples can"
+	elog "be found in the doc directory."
+	elog
+	elog "All config files must have a '.conf' extension."
+	elog
+	elog "Please do not use the 'run-as-user', 'run-as-euser',"
+	elog "'cache-file' and 'pidfile' options, since these are"
+	elog "handled internally by the init-script!"
+	elog
+	elog "If you want to use ez-ipupdate in daemon mode,"
+	elog "please add 'daemon' to the config file(s) and"
+	elog "add the ez-ipupdate init-script to the default"
+	elog "runlevel."
+	elog
+	elog "Without the 'daemon' option, you can run the"
+	elog "init-script with the 'update' parameter inside"
+	elog "your PPP ip-up script."
+	elog
 
 	if [ -f /etc/ez-ipupdate.conf ]; then
-		ewarn "!!! IMPORTANT UPDATE NOTICE !!!"
-		ewarn
-		ewarn "The ez-ipupdate init-script can now handle more"
-		ewarn "than one config file. New config file location is"
-		ewarn "/etc/ez-ipupdate/*.conf"
-		ewarn
+		elog "!!! IMPORTANT UPDATE NOTICE !!!"
+		elog
+		elog "The ez-ipupdate init-script can now handle more"
+		elog "than one config file. New config file location is"
+		elog "/etc/ez-ipupdate/*.conf"
+		elog
 		if [ ! -f /etc/ez-ipupdate/default.conf ]; then
 			mv -f /etc/ez-ipupdate.conf /etc/ez-ipupdate/default.conf
-			einfo "Your old configuration has been moved to"
-			einfo "/etc/ez-ipupdate/default.conf"
-			einfo
+			elog "Your old configuration has been moved to"
+			elog "/etc/ez-ipupdate/default.conf"
+			elog
 		fi
-		ebeep
 	fi
 }
diff --git a/net-dns/ez-ipupdate/files/ez-ipupdate.initd b/net-dns/ez-ipupdate/files/ez-ipupdate.initd
index 5b6698b519bf..9df54ee55ce1 100644
--- a/net-dns/ez-ipupdate/files/ez-ipupdate.initd
+++ b/net-dns/ez-ipupdate/files/ez-ipupdate.initd
@@ -1,9 +1,9 @@
 #!/sbin/runscript
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/ez-ipupdate/files/ez-ipupdate.initd,v 1.2 2006/02/10 21:05:05 sbriesen Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/ez-ipupdate/files/ez-ipupdate.initd,v 1.3 2007/10/07 16:38:53 sbriesen Exp $
 
-opts="${opts} update"
+opts="update"
 
 depend() {
 	need net
@@ -82,11 +82,11 @@ update() {
 		TEXT=$(/usr/sbin/ez-ipupdate -q -R ez-ipupd -c "${CONFIG}" -b "${CACHEFILE}" 2>&1)
 		if eend $?; then
 			if [ -n "${TEXT}" ]; then
-				while read line; do einfo "  $line"; done < <(echo "${TEXT}")
+				echo "${TEXT}" | while read line; do einfo "  $line"; done
 			fi
 		else
 			if [ -n "${TEXT}" ]; then
-				while read line; do eerror "  $line"; done < <(echo "${TEXT}")
+				echo "${TEXT}" | while read line; do eerror "  $line"; done
 			fi
 		fi
 	done