--- trunk/bootstrap/mage-bootstrap.sh	2010/04/27 10:09:47	977
+++ trunk/bootstrap/mage-bootstrap.sh	2010/06/28 17:22:52	1075
@@ -9,6 +9,7 @@
 MY_MAGEDIR=""
 MY_PKGDIR=""
 MAGEUPDATE=true
+MAGEUPDATETARBALL=false
 
 die()
 {
@@ -116,15 +117,16 @@
 	echo "Usage: $(basename $0) --opt arg ..."
 	echo
 	echo "Options:"
-	echo "	--profile,    -p  --  select a profile (needed)"
-	echo "	--root,       -r  --  location to new root (needed)"
-	echo "	--magerc,     -m  --  location of mage.rc (needed)"
+	echo "	--profile,        -p  --  select a profile (needed)"
+	echo "	--root,           -r  --  location to new root (needed)"
+	echo "	--magerc,         -m  --  location of mage.rc (needed)"
 	echo
-	echo "	--toolchain,  -t  --  select other toolchain than from profile"
-	echo "	--basesystem, -b  --  select other basesystem than from profile"
-	echo "	--stage1,     -s1 --  if set, abort after stage1 (toolchain)"
-	echo "	--no-update,  -u  --  do not update the mage tree"
-	echo "	--help,       -h  --  prints this help"
+	echo "	--toolchain,      -t  --  select other toolchain than from profile"
+	echo "	--basesystem,     -b  --  select other basesystem than from profile"
+	echo "	--stage1,         -s1 --  if set, abort after stage1 (toolchain)"
+	echo "  --update-tarball, -ut -- update via tarball not rsync"
+	echo "	--no-update,      -u  --  do not update the mage tree"
+	echo "	--help,           -h  --  prints this help"
 	echo
 
 	exit 1
@@ -146,6 +148,7 @@
 		--root|-r) shift; MROOT="$1" ;;
 		--stage1|-s1) ABORT_AFTER_STAGE1=true ;;
 		--magerc|-m) shift; MAGERC="$1" ;;
+		--update-tarball|-ut) shift; MAGEUPDATETARBALL=true ;;
 		--no-update|-u) shift; MAGEUPDATE=false ;;
 		--help|-h) print_usage ;;
 		'') shift;;
@@ -190,7 +193,12 @@
 # update mage tree
 if [[ ${MAGEUPDATE} = true ]]
 then
-	MAGERC="${MAGERC}" mage update || die "update mage-tree"
+	if [[ ${MAGEUPDATETARBALL} = true ]]
+	then
+		MAGERC="${MAGERC}" mage update-tarball || die "update mage-tree"
+	else
+		MAGERC="${MAGERC}" mage update || die "update mage-tree"
+	fi
 fi
 
 # now get the toolchain and the basesystem layout file