From 7e07a5043b53076140a7ac3fe4c71daad5fa7ea7 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN\"" Date: Mon, 7 Nov 2011 21:40:28 +0100 Subject: scripts: use wget, not curl It seems wget is more popular than curl. Signed-off-by: "Yann E. MORIN" diff --git a/configure b/configure index 1770371..8a383c3 100755 --- a/configure +++ b/configure @@ -496,7 +496,7 @@ has_or_abort prog=libtoolize ver='\(GNU libtool.*\) (2[[:digit:]]*\.|1\.6[[:digit:]]*\.|1\.5\.[2-9][[:digit:]]+)' \ err="'libtoolize' 1.5.26 or above was not found" has_or_abort prog=stat -has_or_abort prog="curl" +has_or_abort prog=wget has_or_abort prog=patch has_or_abort prog=tar has_or_abort prog=gzip diff --git a/scripts/functions b/scripts/functions index 63c0423..46955a8 100644 --- a/scripts/functions +++ b/scripts/functions @@ -457,11 +457,10 @@ CT_DoGetFile() { # not easy to detect them, so force a global ${CT_CONNECT_TIMEOUT}-second # timeout. # For curl, no good progress indicator is available. So, be silent. - if CT_DoExecLog ALL curl --ftp-pasv \ - --retry 3 \ - --connect-timeout ${CT_CONNECT_TIMEOUT} \ - --location --fail --silent \ - --output "${tmp}" \ + if CT_DoExecLog ALL wget --passive-ftp --tries=3 -nc \ + --progress=dot:binary \ + -T ${CT_CONNECT_TIMEOUT} \ + -O "${tmp}" \ "${url}" then # Success, we got it, good! -- cgit v0.10.2-6-g49f6