summaryrefslogtreecommitdiffstats
path: root/bin/ebuild.sh
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2011-09-11 17:33:18 -0700
committerZac Medico <zmedico@gentoo.org>2011-09-11 17:33:18 -0700
commit29cc214d53c7babfa825c7a07cc8d58b4fe5da95 (patch)
tree152dd5bdb144eb4867fa6a423671721d7df723e5 /bin/ebuild.sh
parentbddd8215f278a61210a320bb05416020e28ac2c1 (diff)
downloadportage-29cc214d53c7babfa825c7a07cc8d58b4fe5da95.tar.gz
portage-29cc214d53c7babfa825c7a07cc8d58b4fe5da95.tar.bz2
portage-29cc214d53c7babfa825c7a07cc8d58b4fe5da95.zip
ebuild.sh: setup PATH earlier
This avoids "uname: command not found" messages from isolated-functions.sh.
Diffstat (limited to 'bin/ebuild.sh')
-rwxr-xr-xbin/ebuild.sh14
1 files changed, 7 insertions, 7 deletions
diff --git a/bin/ebuild.sh b/bin/ebuild.sh
index 42616d0f9..1cb9269df 100755
--- a/bin/ebuild.sh
+++ b/bin/ebuild.sh
@@ -5,6 +5,13 @@
PORTAGE_BIN_PATH="${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"
PORTAGE_PYM_PATH="${PORTAGE_PYM_PATH:-/usr/lib/portage/pym}"
+ROOTPATH=${ROOTPATH##:}
+ROOTPATH=${ROOTPATH%%:}
+PREROOTPATH=${PREROOTPATH##:}
+PREROOTPATH=${PREROOTPATH%%:}
+PATH=$PORTAGE_BIN_PATH/ebuild-helpers:$PREROOTPATH${PREROOTPATH:+:}/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin${ROOTPATH:+:}$ROOTPATH
+export PATH
+
# Prevent aliases from causing portage to act inappropriately.
# Make sure it's before everything so we don't mess aliases that follow.
unalias -a
@@ -47,13 +54,6 @@ fi
# environment by modifying our PATH.
unset BASH_ENV
-ROOTPATH=${ROOTPATH##:}
-ROOTPATH=${ROOTPATH%%:}
-PREROOTPATH=${PREROOTPATH##:}
-PREROOTPATH=${PREROOTPATH%%:}
-PATH=$PORTAGE_BIN_PATH/ebuild-helpers:$PREROOTPATH${PREROOTPATH:+:}/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin${ROOTPATH:+:}$ROOTPATH
-export PATH
-
# This is just a temporary workaround for portage-9999 users since
# earlier portage versions do not detect a version change in this case
# (9999 to 9999) and therefore they try execute an incompatible version of