Skip to content
Snippets Groups Projects
Commit 4ee172e6 authored by Ben Gamari's avatar Ben Gamari
Browse files

get-win32-tarballs: Fix incorrect parenthesization

Previously the download fallback wasn't parenthesized correctly,
resulting in the mirror being consulted regardless of whether the
downloads.haskell.org download succeeded.

Fixes #18821.
parent 16f83b57
No related branches found
No related tags found
1 merge request!4244get-win32-tarballs: Fix incorrect parenthesization
Pipeline #25970 passed with warnings
......@@ -37,11 +37,13 @@ download_file() {
return
else
echo "Downloading ${description} to ${dest_dir}..."
$curl_cmd || echo "Checking repo.msys2.org instead of Haskell.org..." && $curl_cmd_bnk || {
rm -f "${dest_file}"
fail "ERROR: Download failed."
exit 1
}
$curl_cmd || (
echo "Checking repo.msys2.org instead of Haskell.org..." && $curl_cmd_bnk || {
rm -f "${dest_file}"
fail "ERROR: Download failed."
exit 1
}
)
fi
fi
......@@ -55,11 +57,13 @@ download_file() {
else
local curl_cmd_bnk="true"
fi
$curl_cmd || echo "Checking repo.msys2.org instead of Haskell.org..." && $curl_cmd_bnk || {
$curl_cmd || (
echo "Checking repo.msys2.org instead of Haskell.org..." && $curl_cmd_bnk || {
rm -f "${dest_file}.sig"
fail "ERROR: Download failed."
exit 1
}
)
fi
if test "$verify" = "1"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment