diff options
author | Matt Jordan <mjordan@digium.com> | 2017-03-14 15:12:28 -0500 |
---|---|---|
committer | Matt Jordan <mjordan@digium.com> | 2017-03-14 15:12:28 -0500 |
commit | dfa689cf94077759f77260af7ec65739e0316f6b (patch) | |
tree | ef872b55c83cec972e4c9fb3aaca5cba887e23a4 | |
parent | e87a763e55e6e2f1d6b25e726efe835f2bb5514b (diff) |
configure: Don't use the progress bar with curl when downloading to stdout
In some scenarios, such as when there may not be a terminal (such as
inside a Docker container), curl will apparently direct the progress bar
to stdout. This can cause extra data to be appended to a file curl'd
down to stdout, resulting in md5 verification failures.
This patch removes the progress bar, and tells curl to download the file
silently.
ASTERISK-26872 #close
Change-Id: Ie860b020f627d4372b3e7ce9453de5faafeebe6c
-rwxr-xr-x | configure | 2 | ||||
-rw-r--r-- | configure.ac | 2 |
2 files changed, 2 insertions, 2 deletions
@@ -7976,7 +7976,7 @@ if test "${WGET}" != ":" ; then DOWNLOAD_TIMEOUT='--timeout=$1' else if test "${CURL}" != ":" ; then DOWNLOAD="${CURL} -O --progress-bar -w \"%{url_effective}\n\"" - DOWNLOAD_TO_STDOUT="${CURL} -L --progress-bar" + DOWNLOAD_TO_STDOUT="${CURL} -Ls" DOWNLOAD_TIMEOUT='--max-time $(or $2,$1)' else # Extract the first word of "fetch", so it can be a program name with args. diff --git a/configure.ac b/configure.ac index 9727fb9cb..d9a800ae2 100644 --- a/configure.ac +++ b/configure.ac @@ -318,7 +318,7 @@ if test "${WGET}" != ":" ; then DOWNLOAD_TIMEOUT='--timeout=$1' else if test "${CURL}" != ":" ; then DOWNLOAD="${CURL} -O --progress-bar -w \"%{url_effective}\n\"" - DOWNLOAD_TO_STDOUT="${CURL} -L --progress-bar" + DOWNLOAD_TO_STDOUT="${CURL} -Ls" DOWNLOAD_TIMEOUT='--max-time $(or $2,$1)' else AC_PATH_PROG([FETCH], [fetch], [:]) |