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

Merge branch 'master' of git://factorcode.org/git/factor

db4
Slava Pestov 2010-01-14 15:06:08 -06:00
parent 493155826d bb8cd5a84c
commit 22f4c6cd29
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
build-support/factor.sh
View File

@ -25,9 +25,9 @@ test_program_installed() {
exit_script() { exit_script() {
if [[ $FIND_MAKE_TARGET -eq true ]] ; then if [[ $FIND_MAKE_TARGET -eq true ]] ; then
echo $MAKE_TARGET; echo $MAKE_TARGET;
fi fi
exit $1 exit $1
} }
ensure_program_installed() { ensure_program_installed() {
@ -347,7 +347,7 @@ update_script_name() {
update_script() { update_script() {
update_script=`update_script_name` update_script=`update_script_name`
bash_path=`which bash` bash_path=`which bash`
echo "#!$bash_path" >"$update_script" echo "#!$bash_path" >"$update_script"
echo "git pull \"$GIT_URL\" master" >>"$update_script" echo "git pull \"$GIT_URL\" master" >>"$update_script"
echo "if [[ \$? -eq 0 ]]; then exec \"$0\" $SCRIPT_ARGS; else echo \"git pull failed\"; exit 2; fi" \ echo "if [[ \$? -eq 0 ]]; then exec \"$0\" $SCRIPT_ARGS; else echo \"git pull failed\"; exit 2; fi" \
@ -433,7 +433,7 @@ make_factor() {
update_boot_images() { update_boot_images() {
echo "Deleting old images..." echo "Deleting old images..."
$DELETE checksums.txt* > /dev/null 2>&1 $DELETE checksums.txt* > /dev/null 2>&1
# delete boot images with one or two characters after the dot # delete boot images with one or two characters after the dot
$DELETE $BOOT_IMAGE.{?,??} > /dev/null 2>&1 $DELETE $BOOT_IMAGE.{?,??} > /dev/null 2>&1
$DELETE temp/staging.*.image > /dev/null 2>&1 $DELETE temp/staging.*.image > /dev/null 2>&1
if [[ -f $BOOT_IMAGE ]] ; then if [[ -f $BOOT_IMAGE ]] ; then