From: Arfrever Frehtes Taifersar Arahesis <Arfrever@Gentoo.Org>
Date: Sat, 7 Aug 2010 17:38:59 +0000 (+0200)
Subject: Bug #308835: Support options in shebang and terminate 's' option of sed.
X-Git-Tag: v2.2_rc68~364
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=6dcb8b35d6bda91556ab5bb05d0666f71d207fc9;p=portage.git

Bug #308835: Support options in shebang and terminate 's' option of sed.
---

diff --git a/bin/ebuild.sh b/bin/ebuild.sh
index a68b9731f..2affc923a 100755
--- a/bin/ebuild.sh
+++ b/bin/ebuild.sh
@@ -480,8 +480,8 @@ econf() {
 	: ${ECONF_SOURCE:=.}
 	if [ -x "${ECONF_SOURCE}/configure" ]; then
 		if [[ -n $CONFIG_SHELL && \
-			"$(head -n1 "$ECONF_SOURCE/configure")" =~ ^'#!'[[:space:]]*/bin/sh[[:space:]]*$ ]] ; then
-			sed -e "1s:.*:#!$CONFIG_SHELL" -i "$ECONF_SOURCE/configure" || \
+			"$(head -n1 "$ECONF_SOURCE/configure")" =~ ^'#!'[[:space:]]*/bin/sh([[:space:]]|$) ]] ; then
+			sed -e "1s:^#![[:space:]]*/bin/sh:#!$CONFIG_SHELL:" -i "$ECONF_SOURCE/configure" || \
 				die "Substition of shebang in '$ECONF_SOURCE/configure' failed"
 		fi
 		if [ -e /usr/share/gnuconfig/ ]; then