Fix sed breakage for people with weird PATH, fix tabs. Thanks to Flameeyes once...

svn path=/main/trunk/; revision=3199

diff --git a/bin/sed b/bin/sed
index c3aff930dd10aa9fefd8965bea87e668aabbc60f..6b1a566390599ffe79fc06b75095ad2390f6eca4 100755 (executable)
--- 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