steve
/
factor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

factor.sh: Allow bootstrap on other branches for commands that don't pull from git.

db4
Doug Coleman 2013-01-21 13:17:01 -08:00
parent 295c87b8b1
commit 33c7032533
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
build-support/factor.sh
View File

@ -509,7 +509,6 @@ get_url() {
get_config_info() { get_config_info() {
find_build_info find_build_info
check_git_branch
check_installed_programs check_installed_programs
check_libraries check_libraries
} }
@ -536,12 +535,13 @@ install() {
update() { update() {
get_config_info get_config_info
check_git_branch
git_fetch_factorcode git_fetch_factorcode
backup_factor backup_factor
make_clean_factor make_clean_factor
} }
update_bootstrap() { download_and_bootstrap() {
update_boot_images update_boot_images
bootstrap bootstrap
} }
@ -549,7 +549,7 @@ update_bootstrap() {
net_bootstrap_no_pull() { net_bootstrap_no_pull() {
get_config_info get_config_info
make_clean_factor make_clean_factor
update_bootstrap download_and_bootstrap
} }
refresh_image() { refresh_image() {
@ -616,7 +616,7 @@ case "$1" in
deps-macosx) install_deps_macosx ;; deps-macosx) install_deps_macosx ;;
self-update) update; make_boot_image; bootstrap;; self-update) update; make_boot_image; bootstrap;;
quick-update) update; refresh_image ;; quick-update) update; refresh_image ;;
update) update; update_bootstrap ;; update) update; download_and_bootstrap ;;
bootstrap) get_config_info; bootstrap ;; bootstrap) get_config_info; bootstrap ;;
net-bootstrap) net_bootstrap_no_pull ;; net-bootstrap) net_bootstrap_no_pull ;;
make-target) FIND_MAKE_TARGET=true; ECHO=false; find_build_info; exit_script ;; make-target) FIND_MAKE_TARGET=true; ECHO=false; find_build_info; exit_script ;;