[patch] bootstrap.sh patch

bootstrap-sh-patch (text/plain), 1.03 KB, created by Diego Elio Pettenò (RETIRED) on 2006-10-07 01:11:10 UTC

Index: bootstrap.sh
===================================================================
RCS file: /var/cvsroot/gentoo-x86/scripts/bootstrap.sh,v
retrieving revision 1.82
diff -u -B -r1.82 bootstrap.sh
--- bootstrap.sh	6 Jul 2006 21:25:15 -0000	1.82
+++ bootstrap.sh	7 Oct 2006 07:59:45 -0000
@@ -112,7 +112,11 @@
 	export BOOTSTRAP_STAGE=0
 fi
 
-MYPROFILEDIR=$(readlink -f /etc/make.profile)
+if [[ -n $(type -p realpath) ]]; then
+    MYPROFILEDIR=$(realpath /etc/make.profile)
+else
+    MYPROFILEDIR=$(readlink -f /etc/make.profile)
+fi
 if [[ ! -d ${MYPROFILEDIR} ]] ; then
 	eerror "Error:  '${MYPROFILEDIR}' does not exist.  Exiting."
 	exit 1
@@ -256,7 +260,7 @@
 # that into a variable.
 
 eval $(pycmd 'import portage; print portage.settings.packages;' |
-sed 's/[][,]//g; s/ /\n/g; s/\*//g' | while read p; do n=${p##*/}; n=${n%\'};
+sed 's/[][,]//g; s/\*//g' | tr ' ' '\n' | while read p; do n=${p##*/}; n=${n%\'};
 n=${n%%-[0-9]*}; echo "my$(tr a-z- A-Z_ <<<$n)=$p; "; done)
 
 # This stuff should never fail but will if not enough is installed.