diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2012-07-07 03:34:53 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2012-07-07 03:34:53 +0000 |
| commit | 767613fea963a3826d7290f110d8b04d2f88a2a2 (patch) | |
| tree | c0508256817c9a87b8183e374662256a61b250f3 /scripts | |
| parent | Version bump #424844 by Samuli Suominen. (diff) | |
| download | gentoo-2-767613fea963a3826d7290f110d8b04d2f88a2a2.tar.gz gentoo-2-767613fea963a3826d7290f110d8b04d2f88a2a2.tar.bz2 gentoo-2-767613fea963a3826d7290f110d8b04d2f88a2a2.zip | |
check /etc/portage/make.profile and /etc/make.profile #424235
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/bootstrap.sh | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh index be150cd227c5..b428242df9f8 100755 --- a/scripts/bootstrap.sh +++ b/scripts/bootstrap.sh @@ -1,7 +1,7 @@ #!/bin/bash # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/scripts/bootstrap.sh,v 1.94 2011/11/17 01:51:06 jmbsvicetto Exp $ +# $Header: /var/cvsroot/gentoo-x86/scripts/bootstrap.sh,v 1.95 2012/07/07 03:34:53 vapier Exp $ # people who were here: # (drobbins, 06 Jun 2003) @@ -52,7 +52,7 @@ v_echo() { env "$@" } -cvsver="$Header: /var/cvsroot/gentoo-x86/scripts/bootstrap.sh,v 1.94 2011/11/17 01:51:06 jmbsvicetto Exp $" +cvsver="$Header: /var/cvsroot/gentoo-x86/scripts/bootstrap.sh,v 1.95 2012/07/07 03:34:53 vapier Exp $" cvsver=${cvsver##*,v } cvsver=${cvsver%%Exp*} cvsyear=${cvsver#* } @@ -119,11 +119,15 @@ else export BOOTSTRAP_STAGE=0 fi -if type -P realpath > /dev/null ; then - MYPROFILEDIR=$(realpath /etc/make.profile) -else - MYPROFILEDIR=$(readlink -f /etc/make.profile) -fi +for p in /etc/portage /etc ; do + p+="/make.profile" + [[ -e ${p} ]] || continue + if type -P realpath >/dev/null ; then + MYPROFILEDIR=$(realpath ${p}) + else + MYPROFILEDIR=$(readlink -f ${p}) + fi +done if [[ ! -d ${MYPROFILEDIR} ]] ; then eerror "Error: '${MYPROFILEDIR}' does not exist. Exiting." exit 1 |