summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2012-07-07 03:34:53 +0000
committerMike Frysinger <vapier@gentoo.org>2012-07-07 03:34:53 +0000
commit5eb97ad0a5313071fa8cd29b043be0c90d7325ae (patch)
treeb7e1a6a513bd282314c1638d80605256f05cd401 /scripts
parentVersion bump #424844 by Samuli Suominen. (diff)
downloadhistorical-5eb97ad0a5313071fa8cd29b043be0c90d7325ae.tar.gz
historical-5eb97ad0a5313071fa8cd29b043be0c90d7325ae.tar.bz2
historical-5eb97ad0a5313071fa8cd29b043be0c90d7325ae.zip
check /etc/portage/make.profile and /etc/make.profile #424235
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/bootstrap.sh18
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