[patch] Modification patch - Jon Coome

bootstrap.patch (text/plain), 4.16 KB, created by Jonathan Coome (RETIRED) on 2004-05-25 05:44:23 UTC

--- bootstrap-2.6.sh.old	2004-05-25 13:39:16.289479384 +0100
+++ bootstrap-2.6.sh	2004-05-25 12:14:25.518394224 +0100
@@ -15,18 +15,96 @@
 
 unset STRAP_EMERGE_OPTS 
 STRAP_RUN=1
-if [ "$1" = "--fetchonly" -o "$1" = "-f" ]
-then
-	echo "Running in fetch-only mode..."
-	STRAP_EMERGE_OPTS="-f"
-	unset STRAP_RUN
-elif [ "$1" = "-h" -o "$1" = "--help" ]
-then
-	echo "bootstrap.sh: Please run with no arguments to start bootstrap, or specify"
-	echo "--fetchonly or -f to download source archives only. -h/--help displays this"
-	echo "help."
-	exit 1
-fi
+
+function pretend_fetchonly {
+	if [ z${FETCHONLY} == "z1" ] && [ z${PRETEND} == "z1" ]; then
+		echo
+		echo "Using the pretend and fetchonly functions together will print the paths"
+		echo "that will be used to download the required archives.  This is very often"
+		echo "unhelpful, and could be confusing to new users.  If you really want to "
+		echo "continue, press y here:"
+		echo
+		echo -n "Continue? [y|n] "; read CONTINUE
+	
+		if [ ${CONTINUE} != "y" ] && [ ${CONTINUE} != "yes" ]; then
+			exit 1
+		fi
+	fi
+}
+
+until [ -z $1 ]; do
+	
+	case $1 in
+		
+		-f|--fetchonly)
+			export STRAP_EMERGE_OPTS="${STRAP_EMERGE_OPTS} -f"
+			export FETCHONLY=1
+			pretend_fetchonly
+			shift
+			;;
+		
+		-p|--pretend)
+			export STRAP_EMERGE_OPTS="${STRAP_EMERGE_OPTS} -p"
+			export PRETEND=1
+			pretend_fetchonly
+			shift
+			;;
+		
+		-v|--verbose)
+			export STRAP_EMERGE_OPTS="${STRAP_EMERGE_OPTS} -v"
+			export VERBOSE=1
+			shift
+			;;
+			
+		-r|--resume|-n|--noreplace)
+			export STRAP_EMERGE_OPTS="${STRAP_EMERGE_OPTS} -n"
+			shift
+			;;
+				
+		-h|--help)
+			echo "bootstrap-2.6.sh: The following arguments are valid:"
+			echo
+			echo "    -f or --fetchonly:  This downloads the source archives and then stops"
+			echo "    -a or --pretend:    This will display what the script is going to do first"
+			echo "    -v or --verbose:    This will run emerge in verbose mode"
+			echo "    -h or --help:       Displays this help message"
+			echo "    -r or --resume:     This will, in a sense, resume your bootstrap.  It"
+			echo "                        actually runs emerge with the --noreplace argument,"
+			echo "                        not the --resume option, because emerge is called three"
+			echo "                        times in this script, and that could confuse it."
+			echo "    -n or --noreplace:  As --resume, but more correct in terms of the future use"
+			echo "                        of \"emerge\"."
+			echo
+			echo "  DO NOT USE --resume or --noreplace the first time you run this script!  If"
+			echo "  you do, I will not be responsible for the health of your system!  It is"
+			echo "  included for those whose bootstraps have failed somewhere in the middle, and"
+			echo "  who don't want to start again, after having fixed the problem."
+			echo
+			exit 1
+			;;
+		*)
+			echo "Sorry, the command \"$1\" was not recognised.  Please run $0 --help"
+			echo "to see the list of valid commands"
+			exit 1
+			;;
+	
+	esac
+done
+
+unset STRAP_RUN
+
+# if [ "$1" = "--fetchonly" -o "$1" = "-f" ]
+# then
+#	echo "Running in fetch-only mode..."
+#	STRAP_EMERGE_OPTS="-f"
+#	unset STRAP_RUN
+# elif [ "$1" = "-h" -o "$1" = "--help" ]
+# then
+#	echo "bootstrap.sh: Please run with no arguments to start bootstrap, or specify"
+#	echo "--fetchonly or -f to download source archives only. -h/--help displays this"
+#	echo "help."
+# 	exit 1
+# fi
 
 MYPROFILEDIR="`readlink -f /etc/make.profile`"
 if [ ! -d ${MYPROFILEDIR} ]
@@ -62,7 +140,8 @@
 echo
 echo -e "${GOOD}Gentoo Linux${GENTOO_VERS}; \e[34;01mhttp://www.gentoo.org/${NORMAL}"
 echo -e "Copyright 1999-2004 Gentoo Technologies, Inc.; Distributed under the GPL"
-if [ "${STRAP_EMERGE_OPTS}" = "-f" ]
+
+if [ "${FETCHONLY}" == 1 ]
 then
 	echo "Fetching all bootstrap-related archives..."
 else
@@ -70,6 +149,13 @@
 fi
 echo
 
+if [ -n ${PRETEND} ]; then
+	echo "Do not worry about the message near the end about Portage stopping"
+	echo "to reload itself, by this point it will already have been emerged."
+	echo "Do not follow the instructions about updating portage on its own!"
+	echo
+fi
+
 # This should not be set to get glibc to build properly. See bug #7652.
 LD_LIBRARY_PATH=