Commit 51d8e512 by Mislav Marohnić

Prefer control flow to chaining grouped expressions

Helps avoid the pitfall where ERR trap has no effect.
See 262eb165
parent 262eb165
...@@ -244,13 +244,12 @@ fetch_tarball() { ...@@ -244,13 +244,12 @@ fetch_tarball() {
tar_args="${tar_args/z/j}" tar_args="${tar_args/z/j}"
fi fi
symlink_tarball_from_cache "$package_filename" "$checksum" || { if ! symlink_tarball_from_cache "$package_filename" "$checksum"; then
echo "Downloading ${package_filename}..." >&2 echo "Downloading ${package_filename}..." >&2
{ http head "$mirror_url" && http head "$mirror_url" &&
download_tarball "$mirror_url" "$package_filename" "$checksum" download_tarball "$mirror_url" "$package_filename" "$checksum" ||
} ||
download_tarball "$package_url" "$package_filename" "$checksum" download_tarball "$package_url" "$package_filename" "$checksum"
} fi
{ if tar $tar_args "$package_filename"; then { if tar $tar_args "$package_filename"; then
if [ -z "$KEEP_BUILD_PATH" ]; then if [ -z "$KEEP_BUILD_PATH" ]; then
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment