summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYann E. MORIN" <yann.morin.1998@anciens.enib.fr>2011-11-07 20:40:28 (GMT)
committerYann E. MORIN" <yann.morin.1998@anciens.enib.fr>2011-11-07 20:40:28 (GMT)
commit7e07a5043b53076140a7ac3fe4c71daad5fa7ea7 (patch)
tree9a651e44954141492209b406d4e0090e5c8d1310
parent00a1fd67e9a592016e6a571386c50e557e567641 (diff)
scripts: use wget, not curl
It seems wget is more popular than curl. Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
-rwxr-xr-xconfigure2
-rw-r--r--scripts/functions9
2 files changed, 5 insertions, 6 deletions
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!