From e845711c6fce01a393bde81541462903a63b749a Mon Sep 17 00:00:00 2001 From: Bradley Sepos Date: Sun, 22 Apr 2018 08:07:06 -0400 Subject: scripts: Improve mac-toolchain-build curl parameters. Follow links, force overwrite files (in the temp dir), and set a connect timeout of 30 seconds; same as mingw-w64-build. --- scripts/mac-toolchain-build | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'scripts') diff --git a/scripts/mac-toolchain-build b/scripts/mac-toolchain-build index 139363686..734f1568e 100755 --- a/scripts/mac-toolchain-build +++ b/scripts/mac-toolchain-build @@ -51,25 +51,25 @@ cd "${TEMP_DIR}" # download printf "Downloading [%02i/%02i] %s" "1" "${TOTAL}" "autoconf 2.69" -curl https://ftp.gnu.org/gnu/autoconf/autoconf-2.69.tar.gz -o "autoconf-2.69.tar.gz" >/dev/null 2>&1 || print_fail_and_exit +curl -Lf --connect-timeout 30 https://ftp.gnu.org/gnu/autoconf/autoconf-2.69.tar.gz -o "autoconf-2.69.tar.gz" >/dev/null 2>&1 || print_fail_and_exit echo -en "${CREL}" printf "Downloading [%02i/%02i] %s" "2" "${TOTAL}" "automake 1.15.1" -curl https://ftp.gnu.org/gnu/automake/automake-1.15.1.tar.gz -o "automake-1.15.1.tar.gz" >/dev/null 2>&1 || print_fail_and_exit +curl -Lf --connect-timeout 30 https://ftp.gnu.org/gnu/automake/automake-1.15.1.tar.gz -o "automake-1.15.1.tar.gz" >/dev/null 2>&1 || print_fail_and_exit echo -en "${CREL}" printf "Downloading [%02i/%02i] %s" "3" "${TOTAL}" "cmake 3.9.6" -curl https://cmake.org/files/v3.9/cmake-3.9.6.tar.gz -o "cmake-3.9.6.tar.gz" >/dev/null 2>&1 || print_fail_and_exit +curl -Lf --connect-timeout 30 https://cmake.org/files/v3.9/cmake-3.9.6.tar.gz -o "cmake-3.9.6.tar.gz" >/dev/null 2>&1 || print_fail_and_exit echo -en "${CREL}" printf "Downloading [%02i/%02i] %s" "4" "${TOTAL}" "libtool 2.4.6" -curl https://ftp.gnu.org/gnu/libtool/libtool-2.4.6.tar.gz -o "libtool-2.4.6.tar.gz" >/dev/null 2>&1 || print_fail_and_exit +curl -Lf --connect-timeout 30 https://ftp.gnu.org/gnu/libtool/libtool-2.4.6.tar.gz -o "libtool-2.4.6.tar.gz" >/dev/null 2>&1 || print_fail_and_exit echo -en "${CREL}" printf "Downloading [%02i/%02i] %s" "5" "${TOTAL}" "pkg-config 0.29.2" -curl https://pkg-config.freedesktop.org/releases/pkg-config-0.29.2.tar.gz -o "pkg-config-0.29.2.tar.gz" >/dev/null 2>&1 || print_fail_and_exit +curl -Lf --connect-timeout 30 https://pkg-config.freedesktop.org/releases/pkg-config-0.29.2.tar.gz -o "pkg-config-0.29.2.tar.gz" >/dev/null 2>&1 || print_fail_and_exit echo -en "${CREL}" printf "Downloading [%02i/%02i] %s" "6" "${TOTAL}" "nasm 2.13.02" -curl https://www.nasm.us/pub/nasm/releasebuilds/2.13.02/nasm-2.13.02.tar.bz2 -o "nasm-2.13.02.tar.bz2" >/dev/null 2>&1 || print_fail_and_exit +curl -Lf --connect-timeout 30 https://www.nasm.us/pub/nasm/releasebuilds/2.13.02/nasm-2.13.02.tar.bz2 -o "nasm-2.13.02.tar.bz2" >/dev/null 2>&1 || print_fail_and_exit echo -en "${CREL}" printf "Downloading [%02i/%02i] %s" "7" "${TOTAL}" "yasm 1.3.0" -curl https://www.tortall.net/projects/yasm/releases/yasm-1.3.0.tar.gz -o "yasm-1.3.0.tar.gz" >/dev/null 2>&1 || print_fail_and_exit +curl -Lf --connect-timeout 30 https://www.tortall.net/projects/yasm/releases/yasm-1.3.0.tar.gz -o "yasm-1.3.0.tar.gz" >/dev/null 2>&1 || print_fail_and_exit echo -en "${CREL}" printf "Downloading [%02i/%02i] complete.\n" "${TOTAL}" "${TOTAL}" -- cgit v1.2.3