Ensure fallback to curl after failed wget

This commit is contained in:
John Luo
2017-08-02 14:32:21 -07:00
parent d2858beaa1
commit 63f7ac9330

View File

@@ -99,16 +99,19 @@ __get_remote_file() {
return 0 return 0
fi fi
local succeeded=false local failed=false
if __machine_has wget; then if __machine_has wget; then
wget --tries 10 --quiet -O "$local_path" "$remote_path" && succeeded=true wget --tries 10 --quiet -O "$local_path" "$remote_path" || failed=true
else
failed=true
fi fi
if [ "$succeeded" = false ] && __machine_has curl; then if [ "$failed" = true ] && __machine_has curl; then
curl --retry 10 -sSL -f --create-dirs -o "$local_path" "$remote_path" && succeeded=true failed=false
curl --retry 10 -sSL -f --create-dirs -o "$local_path" "$remote_path" || failed=true
fi fi
if [ "$succeeded" = false ]; then if [ "$failed" = true ]; then
__error "Download failed: $remote_path" 1>&2 __error "Download failed: $remote_path" 1>&2
return 1 return 1
fi fi