]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
configure: Don't use the progress bar with curl when downloading to stdout
authorMatt Jordan <mjordan@digium.com>
Tue, 14 Mar 2017 20:12:28 +0000 (15:12 -0500)
committerMatt Jordan <mjordan@digium.com>
Tue, 14 Mar 2017 20:12:28 +0000 (15:12 -0500)
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

configure
configure.ac

index 5091f592cfff091d59eddbe4cb572d0c075d23bd..dc469d79ed0965ebf69fe2578cbc1a34aabb397e 100755 (executable)
--- a/configure
+++ b/configure
@@ -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.
index 9727fb9cb7b0519552f38057f492279f350c7067..d9a800ae255fc554f0e4d86abe3f0232895e8be4 100644 (file)
@@ -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], [:])