Skip to content
Snippets Groups Projects
Commit 2cb449a6 authored by Joshua Colp's avatar Joshua Colp Committed by Gerrit Code Review
Browse files

Merge "configure: Don't use the progress bar with curl when downloading to stdout"

parents 71cc3fd9 59130260
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
configure
+ 1
− 1
View file @ 2cb449a6
...@@ -7940,7 +7940,7 @@ if test "${WGET}" != ":" ; then ...@@ -7940,7 +7940,7 @@ if test "${WGET}" != ":" ; then
DOWNLOAD_TIMEOUT='--timeout=$1' DOWNLOAD_TIMEOUT='--timeout=$1'
else if test "${CURL}" != ":" ; then else if test "${CURL}" != ":" ; then
DOWNLOAD="${CURL} -O --progress-bar -w \"%{url_effective}\n\"" 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)' DOWNLOAD_TIMEOUT='--max-time $(or $2,$1)'
else else
# Extract the first word of "fetch", so it can be a program name with args. # Extract the first word of "fetch", so it can be a program name with args.
......
configure.ac
+ 1
− 1
View file @ 2cb449a6
...@@ -318,7 +318,7 @@ if test "${WGET}" != ":" ; then ...@@ -318,7 +318,7 @@ if test "${WGET}" != ":" ; then
DOWNLOAD_TIMEOUT='--timeout=$1' DOWNLOAD_TIMEOUT='--timeout=$1'
else if test "${CURL}" != ":" ; then else if test "${CURL}" != ":" ; then
DOWNLOAD="${CURL} -O --progress-bar -w \"%{url_effective}\n\"" 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)' DOWNLOAD_TIMEOUT='--max-time $(or $2,$1)'
else else
AC_PATH_PROG([FETCH], [fetch], [:]) AC_PATH_PROG([FETCH], [fetch], [:])
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment