| 1 |
commit: 90b5d930ae9163a749b35c3b97f17a010136f976 |
| 2 |
Author: Mike Frysinger <vapier <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Mar 1 08:41:42 2011 +0000 |
| 4 |
Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Mar 1 08:41:42 2011 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sandbox.git;a=commit;h=90b5d930 |
| 7 |
|
| 8 |
sandbox.bashrc: support newer /etc/portage files |
| 9 |
|
| 10 |
Signed-off-by: Mike Frysinger <vapier <AT> gentoo.org> |
| 11 |
|
| 12 |
--- |
| 13 |
data/sandbox.bashrc | 15 ++++++++------- |
| 14 |
1 files changed, 8 insertions(+), 7 deletions(-) |
| 15 |
|
| 16 |
diff --git a/data/sandbox.bashrc b/data/sandbox.bashrc |
| 17 |
index 39d4d1a..7601d35 100644 |
| 18 |
--- a/data/sandbox.bashrc |
| 19 |
+++ b/data/sandbox.bashrc |
| 20 |
@@ -54,15 +54,16 @@ if [[ ${SANDBOX_INTRACTV} == "1" && -t 1 ]] || [[ ${__SANDBOX_TESTING} == "yes" |
| 21 |
# build area or not ... uNF uNF uNF |
| 22 |
#sbs_pdir=$(portageq envvar PORTAGE_TMPDIR)/portage/ #portageq takes too long imo |
| 23 |
if [[ -z ${PORTAGE_TMPDIR} ]] ; then |
| 24 |
- sbs_gpdir=$( source /etc/make.globals && echo $PORTAGE_TMPDIR 2> /dev/null) |
| 25 |
- sbs_cpdir=$( source /etc/make.conf && echo $PORTAGE_TMPDIR 2> /dev/null) |
| 26 |
- [[ -z ${sbs_cpdir} ]] \ |
| 27 |
- && sbs_pdir=${sbs_gpdir} \ |
| 28 |
- || sbs_pdir=${sbs_cpdir} |
| 29 |
+ sbs_pdir=$( |
| 30 |
+ for f in /etc/{,portage/}make.globals /etc/{,portage/}make.conf ; do |
| 31 |
+ [[ -e ${f} ]] && source ${f} |
| 32 |
+ done |
| 33 |
+ echo $PORTAGE_TMPDIR |
| 34 |
+ ) |
| 35 |
else |
| 36 |
sbs_pdir=${PORTAGE_TMPDIR} |
| 37 |
fi |
| 38 |
- [[ -z ${sbs_pdir} ]] && sbs_pdir=/var/tmp |
| 39 |
+ : ${sbs_pdir:=/var/tmp} |
| 40 |
sbs_pdir=${sbs_pdir}/portage/ |
| 41 |
|
| 42 |
if [[ ${PWD:0:${#sbs_pdir}} == "${sbs_pdir}" ]] ; then |
| 43 |
@@ -85,7 +86,7 @@ if [[ ${SANDBOX_INTRACTV} == "1" && -t 1 ]] || [[ ${__SANDBOX_TESTING} == "yes" |
| 44 |
fi |
| 45 |
fi |
| 46 |
|
| 47 |
- unset sbs_gpdir sbs_cpdir sbs_pdir sbs_bdir sbs_tmpenvfile sbs_PREPWD env |
| 48 |
+ unset sbs_pdir sbs_bdir sbs_tmpenvfile sbs_PREPWD env |
| 49 |
fi |
| 50 |
|
| 51 |
cd "${PWD}" |
Archives