From de7531424b42fb9c05f960d82cecc745b07586d1 Mon Sep 17 00:00:00 2001
From: Doug Coleman <doug.coleman@gmail.com>
Date: Tue, 18 Dec 2007 16:59:03 -0600
Subject: [PATCH 1/2] Return 1 to shell on error

---
 core/bootstrap/stage2.factor | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/core/bootstrap/stage2.factor b/core/bootstrap/stage2.factor
index 59daa3ab53..46b1989357 100755
--- a/core/bootstrap/stage2.factor
+++ b/core/bootstrap/stage2.factor
@@ -67,10 +67,12 @@ IN: bootstrap.stage2
         [
             boot
             do-init-hooks
-            [ parse-command-line ] try
-            [ run-user-init ] try
-            [ "run" get run ] try
-            stdio get [ stream-flush ] when*
+            [
+                parse-command-line
+                run-user-init
+                "run" get run
+                stdio get [ stream-flush ] when*
+            ] [ print-error 1 exit ] recover
         ] set-boot-quot
 
         : count-words all-words swap subset length pprint ;

From 27ed0225abb69a227521418d65f7fdbf867cf92c Mon Sep 17 00:00:00 2001
From: Doug Coleman <doug.coleman@gmail.com>
Date: Tue, 18 Dec 2007 17:07:24 -0600
Subject: [PATCH 2/2] add self-update to factor.sh -- it downloads git, makes
 an image, and bootstraps

---
 misc/factor.sh | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/misc/factor.sh b/misc/factor.sh
index 12fb45a3e9..4913a57b75 100755
--- a/misc/factor.sh
+++ b/misc/factor.sh
@@ -152,6 +152,7 @@ echo_build_info() {
 	echo FACTOR_BINARY=$FACTOR_BINARY
 	echo MAKE_TARGET=$MAKE_TARGET
 	echo BOOT_IMAGE=$BOOT_IMAGE
+	echo MAKE_IMAGE_TARGET=$MAKE_IMAGE_TARGET
 }
 
 set_build_info() {
@@ -164,11 +165,18 @@ set_build_info() {
 	fi
 	
 	MAKE_TARGET=$OS-$ARCH-$WORD
+	MAKE_IMAGE_TARGET=$ARCH.$WORD
 	BOOT_IMAGE=boot.$ARCH.$WORD.image
 	if [[ $OS == macosx && $ARCH == ppc ]] ; then
+		MAKE_IMAGE_TARGET=$OS-$ARCH
 		MAKE_TARGET=$OS-$ARCH
 		BOOT_IMAGE=boot.macosx-ppc.image
 	fi
+	if [[ $OS == linux && $ARCH == ppc ]] ; then
+		MAKE_IMAGE_TARGET=$OS-$ARCH
+		MAKE_TARGET=$OS-$ARCH
+		BOOT_IMAGE=boot.linux-ppc.image
+	fi
 }
 
 find_build_info() {
@@ -266,7 +274,14 @@ update_bootstrap() {
 }
 
 refresh_image() {
-	./$FACTOR_BINARY -e="refresh-all save 0 USE: system exit"
+	./$FACTOR_BINARY -script -e="refresh-all save 0 USE: system exit"
+	check_ret factor
+}
+
+make_boot_image() {
+	./$FACTOR_BINARY -script -e="\"$MAKE_IMAGE_TARGET\" USE: bootstrap.image make-image save 0 USE: system exit"
+	check_ret factor
+	
 }
 
 install_libraries() {
@@ -276,6 +291,7 @@ install_libraries() {
 case "$1" in
 	install) install ;;
 	install-x11) install_libraries; install ;;
+	self-update) update; make_boot_image; bootstrap;;
 	quick-update) update; refresh_image ;;
 	update) update; update_bootstrap ;;
 	*) usage ;;