| 1 |
vapier 12/07/07 03:34:53 |
| 2 |
|
| 3 |
Modified: bootstrap.sh |
| 4 |
Log: |
| 5 |
check /etc/portage/make.profile and /etc/make.profile #424235 |
| 6 |
|
| 7 |
Revision Changes Path |
| 8 |
1.95 scripts/bootstrap.sh |
| 9 |
|
| 10 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/scripts/bootstrap.sh?rev=1.95&view=markup |
| 11 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/scripts/bootstrap.sh?rev=1.95&content-type=text/plain |
| 12 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/scripts/bootstrap.sh?r1=1.94&r2=1.95 |
| 13 |
|
| 14 |
Index: bootstrap.sh |
| 15 |
=================================================================== |
| 16 |
RCS file: /var/cvsroot/gentoo-x86/scripts/bootstrap.sh,v |
| 17 |
retrieving revision 1.94 |
| 18 |
retrieving revision 1.95 |
| 19 |
diff -u -r1.94 -r1.95 |
| 20 |
--- bootstrap.sh 17 Nov 2011 01:51:06 -0000 1.94 |
| 21 |
+++ bootstrap.sh 7 Jul 2012 03:34:53 -0000 1.95 |
| 22 |
@@ -1,7 +1,7 @@ |
| 23 |
#!/bin/bash |
| 24 |
# Copyright 1999-2007 Gentoo Foundation |
| 25 |
# Distributed under the terms of the GNU General Public License v2 |
| 26 |
-# $Header: /var/cvsroot/gentoo-x86/scripts/bootstrap.sh,v 1.94 2011/11/17 01:51:06 jmbsvicetto Exp $ |
| 27 |
+# $Header: /var/cvsroot/gentoo-x86/scripts/bootstrap.sh,v 1.95 2012/07/07 03:34:53 vapier Exp $ |
| 28 |
|
| 29 |
# people who were here: |
| 30 |
# (drobbins, 06 Jun 2003) |
| 31 |
@@ -52,7 +52,7 @@ |
| 32 |
env "$@" |
| 33 |
} |
| 34 |
|
| 35 |
-cvsver="$Header: /var/cvsroot/gentoo-x86/scripts/bootstrap.sh,v 1.94 2011/11/17 01:51:06 jmbsvicetto Exp $" |
| 36 |
+cvsver="$Header: /var/cvsroot/gentoo-x86/scripts/bootstrap.sh,v 1.95 2012/07/07 03:34:53 vapier Exp $" |
| 37 |
cvsver=${cvsver##*,v } |
| 38 |
cvsver=${cvsver%%Exp*} |
| 39 |
cvsyear=${cvsver#* } |
| 40 |
@@ -119,11 +119,15 @@ |
| 41 |
export BOOTSTRAP_STAGE=0 |
| 42 |
fi |
| 43 |
|
| 44 |
-if type -P realpath > /dev/null ; then |
| 45 |
- MYPROFILEDIR=$(realpath /etc/make.profile) |
| 46 |
-else |
| 47 |
- MYPROFILEDIR=$(readlink -f /etc/make.profile) |
| 48 |
-fi |
| 49 |
+for p in /etc/portage /etc ; do |
| 50 |
+ p+="/make.profile" |
| 51 |
+ [[ -e ${p} ]] || continue |
| 52 |
+ if type -P realpath >/dev/null ; then |
| 53 |
+ MYPROFILEDIR=$(realpath ${p}) |
| 54 |
+ else |
| 55 |
+ MYPROFILEDIR=$(readlink -f ${p}) |
| 56 |
+ fi |
| 57 |
+done |
| 58 |
if [[ ! -d ${MYPROFILEDIR} ]] ; then |
| 59 |
eerror "Error: '${MYPROFILEDIR}' does not exist. Exiting." |
| 60 |
exit 1 |
Archives