From 0c89363dfe8afd98e67b8916ae8233904026493f Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Sat, 1 Sep 2012 16:08:16 -0700 Subject: ebuild-helpers/sed: move to bsd subdirectory This helps to prevent inappropriate use of the sed wrapper on GNU systems, which commonly occurs when users install portage manually during recovery situations. --- bin/ebuild-helpers/bsd/sed | 27 +++++++++++++++++++++++++++ bin/ebuild-helpers/sed | 27 --------------------------- 2 files changed, 27 insertions(+), 27 deletions(-) create mode 100755 bin/ebuild-helpers/bsd/sed delete mode 100755 bin/ebuild-helpers/sed (limited to 'bin') diff --git a/bin/ebuild-helpers/bsd/sed b/bin/ebuild-helpers/bsd/sed new file mode 100755 index 000000000..cc447696d --- /dev/null +++ b/bin/ebuild-helpers/bsd/sed @@ -0,0 +1,27 @@ +#!/bin/bash +# Copyright 2007-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +scriptpath=${BASH_SOURCE[0]} +scriptname=${scriptpath##*/} + +if [[ sed == ${scriptname} ]] && [[ -n ${ESED} ]]; then + exec ${ESED} "$@" +elif type -P g${scriptname} > /dev/null ; then + exec g${scriptname} "$@" +else + old_IFS="${IFS}" + IFS=":" + + for path in $PATH; do + if [[ -x ${path}/${scriptname} ]]; then + [[ ${path}/${scriptname} -ef ${scriptpath} ]] && continue + exec ${path}/${scriptname} "$@" + exit 0 + fi + done + + IFS="${old_IFS}" +fi + +exit 1 diff --git a/bin/ebuild-helpers/sed b/bin/ebuild-helpers/sed deleted file mode 100755 index cc447696d..000000000 --- a/bin/ebuild-helpers/sed +++ /dev/null @@ -1,27 +0,0 @@ -#!/bin/bash -# Copyright 2007-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -scriptpath=${BASH_SOURCE[0]} -scriptname=${scriptpath##*/} - -if [[ sed == ${scriptname} ]] && [[ -n ${ESED} ]]; then - exec ${ESED} "$@" -elif type -P g${scriptname} > /dev/null ; then - exec g${scriptname} "$@" -else - old_IFS="${IFS}" - IFS=":" - - for path in $PATH; do - if [[ -x ${path}/${scriptname} ]]; then - [[ ${path}/${scriptname} -ef ${scriptpath} ]] && continue - exec ${path}/${scriptname} "$@" - exit 0 - fi - done - - IFS="${old_IFS}" -fi - -exit 1 -- cgit v1.2.3-1-g7c22