diff -r 5374ab57d331 -r ac3e215141a1 scripts/functions --- a/scripts/functions Fri Oct 22 22:02:49 2010 +0200 +++ b/scripts/functions Tue Nov 16 10:00:27 2010 +0100 @@ -383,31 +383,16 @@ || rm -f "${1##*/}" } -# Download using aria2 -# Usage: CT_DoGetFileAria2 -CT_DoGetFileAria2() { - # Note: comments about curl method (above) are also valid here - # Plus: default progress indicator is a single line, so use verbose log - # so that the CT-NG's ouput is 'live'. - CT_DoExecLog ALL aria2c --summary-interval=1 -s ${CT_DOWNLOAD_MAX_CHUNKS} -m 3 -t ${CT_CONNECT_TIMEOUT} -p "$1" \ - || CT_DoExecLog ALL aria2c --summary-interval=1 -s ${CT_DOWNLOAD_MAX_CHUNKS} -m 3 -t ${CT_CONNECT_TIMEOUT} "$1" \ - || rm -f "${1##*/}" -} - # OK, just look if we have them... -_aria2c=$(CT_Which aria2c) _wget=$(CT_Which wget) _curl=$(CT_Which curl) # Wrapper function to call one of, in order of preference: -# aria2 # curl # wget # Usage: CT_DoGetFile CT_DoGetFile() { - if [ -n "${_aria2c}" -a ${CT_DOWNLOAD_MAX_CHUNKS} -gt 1 ]; then - CT_DoGetFileAria2 "$1" - elif [ -n "${_curl}" ]; then + if [ -n "${_curl}" ]; then CT_DoGetFileCurl "$1" elif [ -n "${_wget}" ]; then CT_DoGetFileWget "$1"