From 3fc1cef8987a842b62e525f61fb24c0384861cc2 Mon Sep 17 00:00:00 2001 From: Alec Warner Date: Sun, 23 Apr 2006 15:55:13 +0000 Subject: Fix sed breakage for people with weird PATH, fix tabs. Thanks to Flameeyes once again. svn path=/main/trunk/; revision=3199 --- bin/sed | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/bin/sed b/bin/sed index c3aff930d..6b1a56639 100755 --- a/bin/sed +++ b/bin/sed @@ -2,23 +2,25 @@ # Copyright 2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 +scriptpath=$_ + if [[ -n ${ESED} ]]; then -exec ${ESED} "$@" + exec ${ESED} "$@" elif type -p gsed > /dev/null ; then -exec gsed "$@" + exec gsed "$@" else -old_IFS="${IFS}" -IFS=":" + old_IFS="${IFS}" + IFS=":" -SEARCH=${PATH#*:} -for path in $SEARCH; do -if [[ -x $path/sed ]]; then -exec $path/sed "$@" -exit 0 -fi -done - -IFS="${old_IFS}" + for path in $PATH; do + [[ ${path}/sed == $scriptpath ]] && continue + if [[ -x $path/sed ]]; then + exec $path/sed "$@" + exit 0 + fi + done + + IFS="${old_IFS}" fi exit 1 -- cgit v1.2.3-1-g7c22