From 454efe0942fd0decbb35f76d78e8b9939cc7de82 Mon Sep 17 00:00:00 2001 From: Doug Coleman Date: Sat, 9 Dec 2017 09:38:23 +0000 Subject: [PATCH] build.sh: Use the branch for downloading images, which was the entire point of these patches. --- build.sh | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/build.sh b/build.sh index 9e4398d085..dbad03c616 100755 --- a/build.sh +++ b/build.sh @@ -565,11 +565,12 @@ find_branch() { } checksum_url() { - branch=$(current_git_branch) - echo "http://downloads.factorcode.org/images/$branch/checksums.txt" + find_branch + echo "http://downloads.factorcode.org/images/$CURRENT_BRANCH/checksums.txt" } update_boot_images() { + find_branch $ECHO "Deleting old images..." $DELETE checksums.txt* > /dev/null 2>&1 # delete boot images with one or two characters after the dot @@ -594,8 +595,8 @@ update_boot_images() { } boot_image_url() { - branch=$(current_git_branch) - echo "http://downloads.factorcode.org/images/$branch/$BOOT_IMAGE" + find_branch + echo "http://downloads.factorcode.org/images/$CURRENT_BRANCH/$BOOT_IMAGE" } get_boot_image() {