build script: Fix message on failed download (fixes #456) (#457)

[termux-packages] / build-package.sh

diff --git a/build-package.sh b/build-package.sh
index d9da825..539ec5b 100755 (executable)
--- a/build-package.sh
+++ b/build-package.sh
@@ -161,7 +161,8 @@ termux_download() {
 
        TMPFILE=`mktemp $TERMUX_PKG_TMPDIR/download.$TERMUX_PKG_NAME.XXXXXXXXX`
        echo "Downloading ${URL}"
-       for i in 1 2 3 4 5 6; do
+       TRYMAX=6
+       for try in $(seq 1 $TRYMAX); do
                if curl -L --fail --retry 2 -o "$TMPFILE" "$URL"; then
                        if [ $# = 3 ]; then
                                # Optional checksum argument:
@@ -173,7 +174,7 @@ termux_download() {
                        mv "$TMPFILE" "$DESTINATION"
                        return
                else
-                       echo "Download of $1 failed (attempt $i/3)" 1>&2
+                       echo "Download of $1 failed (attempt $try/$TRYMAX)" 1>&2
                        sleep 45
                fi
        done
@@ -204,12 +205,6 @@ if [ $TERMUX_ELF_CLEANER_SRC -nt $TERMUX_ELF_CLEANER ]; then
        g++ -std=c++11 -Wall -Wextra -pedantic -Os $TERMUX_ELF_CLEANER_SRC -o $TERMUX_ELF_CLEANER
 fi
 
-# Keep track of when build started so we can see what files have been created
-export TERMUX_BUILD_TS_FILE=$TERMUX_PKG_TMPDIR/timestamp_$TERMUX_PKG_NAME
-sleep 1 # Sleep so that any generated files above (such as zlib.c and $PREFIX/bin/sh)
-       #get older timestamp then TERMUX_BUILD_TS_FILE
-rm -f $TERMUX_BUILD_TS_FILE && touch $TERMUX_BUILD_TS_FILE
-
 # Run just after sourcing $TERMUX_PKG_BUILDER_SCRIPT
 termux_step_extract_package () {
         if [ -z "${TERMUX_PKG_SRCURL:=""}" ]; then
@@ -530,7 +525,7 @@ termux_setup_golang () {
                exit 1
        fi
 
-       local TERMUX_GO_VERSION=go1.7
+       local TERMUX_GO_VERSION=go1.7.1
        local TERMUX_GO_PLATFORM=linux-amd64
        test `uname` = "Darwin" && TERMUX_GO_PLATFORM=darwin-amd64
 
@@ -730,6 +725,12 @@ Cflags: -I$TERMUX_STANDALONE_TOOLCHAIN/sysroot/usr/include
 HERE
 fi
 
+# Keep track of when build started so we can see what files have been created.
+# We start by sleeping so that any generated files above (such as zlib.pc) get
+# an older timestamp than the TERMUX_BUILD_TS_FILE.
+sleep 1
+TERMUX_BUILD_TS_FILE=$TERMUX_PKG_TMPDIR/timestamp_$TERMUX_PKG_NAME
+touch $TERMUX_BUILD_TS_FILE
 
 # Start by extracting the package src into $TERMUX_PKG_SRCURL:
 termux_step_extract_package