[gentoo-commits] proj/sandbox:master commit in: data/

["Mike Frysinger" <vapier@gentoo.org>]

commit:     90b5d930ae9163a749b35c3b97f17a010136f976
Author:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Tue Mar  1 08:41:42 2011 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Tue Mar  1 08:41:42 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sandbox.git;a=commit;h=90b5d930

sandbox.bashrc: support newer /etc/portage files

Signed-off-by: Mike Frysinger <vapier <AT> gentoo.org>

---
 data/sandbox.bashrc |   15 ++++++++-------
 1 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/data/sandbox.bashrc b/data/sandbox.bashrc
index 39d4d1a..7601d35 100644
--- a/data/sandbox.bashrc
+++ b/data/sandbox.bashrc
@@ -54,15 +54,16 @@ if [[ ${SANDBOX_INTRACTV} == "1" && -t 1 ]] || [[ ${__SANDBOX_TESTING} == "yes"
 		# build area or not ... uNF uNF uNF
 		#sbs_pdir=$(portageq envvar PORTAGE_TMPDIR)/portage/ #portageq takes too long imo
 		if [[ -z ${PORTAGE_TMPDIR} ]] ; then
-			sbs_gpdir=$( source /etc/make.globals && echo $PORTAGE_TMPDIR 2> /dev/null)
-			sbs_cpdir=$( source /etc/make.conf && echo $PORTAGE_TMPDIR 2> /dev/null)
-			[[ -z ${sbs_cpdir} ]] \
-				&& sbs_pdir=${sbs_gpdir} \
-				|| sbs_pdir=${sbs_cpdir}
+			sbs_pdir=$(
+				for f in /etc/{,portage/}make.globals /etc/{,portage/}make.conf ; do
+					[[ -e ${f} ]] && source ${f}
+				done
+				echo $PORTAGE_TMPDIR
+			)
 		else
 			sbs_pdir=${PORTAGE_TMPDIR}
 		fi
-		[[ -z ${sbs_pdir} ]] && sbs_pdir=/var/tmp
+		: ${sbs_pdir:=/var/tmp}
 		sbs_pdir=${sbs_pdir}/portage/
 
 		if [[ ${PWD:0:${#sbs_pdir}} == "${sbs_pdir}" ]] ; then
@@ -85,7 +86,7 @@ if [[ ${SANDBOX_INTRACTV} == "1" && -t 1 ]] || [[ ${__SANDBOX_TESTING} == "yes"
 			fi
 		fi
 
-		unset sbs_gpdir sbs_cpdir sbs_pdir sbs_bdir sbs_tmpenvfile sbs_PREPWD env
+		unset sbs_pdir sbs_bdir sbs_tmpenvfile sbs_PREPWD env
 	fi
 
 	cd "${PWD}"