diff -r ea1c9143e1e3 -r 62b3f52315b3 scripts/functions --- a/scripts/functions Tue Nov 16 17:49:15 2010 +0100 +++ b/scripts/functions Mon Nov 29 00:26:39 2010 +0100 @@ -359,6 +359,8 @@ # to find the requested URL (think about snapshots, different layouts # for different gcc versions, etc...). CT_DoGetFile() { + local dest="${1##*/}" + local tmp="${dest}.tmp-dl" # OK, just look if we have them... # We are sure at least one is available, ./configure checked for it. local _curl=$(CT_Which curl) @@ -366,6 +368,9 @@ _curl="${_curl:-false}" _wget="${_wget:-false}" + # Remove potential left-over from a previous run + rm -f "${tmp}" + # Some (very old!) FTP server might not support the passive mode, thus # retry without. # We also retry a few times, in case there is a transient error (eg. behind @@ -377,11 +382,17 @@ # not easy to detect them, and wget does not timeout by default while # connecting, so force a global ${CT_CONNECT_TIMEOUT}-second timeout. # For curl, no good progress indicator is available. So, be silent. - CT_DoExecLog ALL "${_curl}" --ftp-pasv --retry 3 --connect-timeout ${CT_CONNECT_TIMEOUT} -L -f -s -O "$1" \ - || CT_DoExecLog ALL "${_curl}" --retry 3 --connect-timeout ${CT_CONNECT_TIMEOUT} -L -f -s -O "$1" \ - || CT_DoExecLog ALL "${_wget}" --passive-ftp --tries=3 -T ${CT_CONNECT_TIMEOUT} -nc --progress=dot:binary "$1" \ - || CT_DoExecLog ALL "${_wget}" --tries=3 -T ${CT_CONNECT_TIMEOUT} -nc --progress=dot:binary "$1" \ - || rm -f "${1##*/}" + if CT_DoExecLog ALL "${_curl}" --ftp-pasv --retry 3 --connect-timeout ${CT_CONNECT_TIMEOUT} -L -f -s -o "${tmp}" "$1" \ + || CT_DoExecLog ALL "${_curl}" --retry 3 --connect-timeout ${CT_CONNECT_TIMEOUT} -L -f -s -o "${tmp}" "$1" \ + || CT_DoExecLog ALL "${_wget}" --passive-ftp --tries=3 -T ${CT_CONNECT_TIMEOUT} -nc --progress=dot:binary -O "${tmp}" "$1" \ + || CT_DoExecLog ALL "${_wget}" --tries=3 -T ${CT_CONNECT_TIMEOUT} -nc --progress=dot:binary -O "${tmp}" "$1" \ + ; then + # One of them succeeded, good! + mv "${tmp}" "${dest}" + else + # Woops... + rm -f "${tmp}" + fi } # This function tries to retrieve a tarball form a local directory