From e158dc19f4ff613085d4cbe5c1fd6c4909c2b68f Mon Sep 17 00:00:00 2001
From: Doug Coleman <doug.coleman@gmail.com>
Date: Fri, 28 Oct 2011 22:48:55 -0700
Subject: [PATCH] factor.sh: Make net-bootstrap recompile the vm, add
 make_clean_factor function

---
 build-support/factor.sh | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/build-support/factor.sh b/build-support/factor.sh
index 4086c13ecb..5e1aa5fed5 100755
--- a/build-support/factor.sh
+++ b/build-support/factor.sh
@@ -456,6 +456,11 @@ make_factor() {
     invoke_make NO_UI=$NO_UI $MAKE_TARGET -j5
 }
 
+make_clean_factor() {
+    make_clean
+    make_factor
+}
+
 update_boot_images() {
     $ECHO "Deleting old images..."
     $DELETE checksums.txt* > /dev/null 2>&1
@@ -510,7 +515,7 @@ copy_fresh_image() {
 
 bootstrap() {
     ./$FACTOR_BINARY -i=$BOOT_IMAGE
-	copy_fresh_image
+    copy_fresh_image
 }
 
 install() {
@@ -523,13 +528,11 @@ install() {
     bootstrap
 }
 
-
 update() {
     get_config_info
     git_fetch_factorcode
     backup_factor
-    make_clean
-    make_factor
+    make_clean_factor
 }
 
 update_bootstrap() {
@@ -537,6 +540,12 @@ update_bootstrap() {
     bootstrap
 }
 
+net_bootstrap_no_pull() {
+    get_config_info
+    make_clean_factor
+    update_bootstrap
+}
+
 refresh_image() {
     ./$FACTOR_BINARY -script -e="USING: vocabs.loader vocabs.refresh system memory ; refresh-all save 0 exit"
     check_ret factor
@@ -545,7 +554,6 @@ refresh_image() {
 make_boot_image() {
     ./$FACTOR_BINARY -script -e="\"$MAKE_IMAGE_TARGET\" USING: system bootstrap.image memory ; make-image save 0 exit"
     check_ret factor
-
 }
 
 install_deps_linux() {
@@ -593,7 +601,7 @@ case "$1" in
     quick-update) update; refresh_image ;;
     update) update; update_bootstrap ;;
     bootstrap) get_config_info; bootstrap ;;
-    net-bootstrap) get_config_info; update_boot_images; bootstrap ;;
+    net-bootstrap) net_bootstrap_no_pull ;;
     make-target) FIND_MAKE_TARGET=true; ECHO=false; find_build_info; exit_script ;;
     report) find_build_info ;;
     *) usage ;;