[Git][ghc/ghc][ghc-8.8] get-win32-tarballs: Fix incorrect parenthesization

[Ben Gamari]

Ben Gamari pushed to branch ghc-8.8 at Glasgow Haskell Compiler / GHC


Commits:
4ee172e6 by Ben Gamari at 2020-10-08T16:27:23-04:00
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.

- - - - -


1 changed file:

- mk/get-win32-tarballs.sh


Changes:

=====================================
mk/get-win32-tarballs.sh
=====================================
@@ -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"



View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/4ee172e66cd76c22da4d3b991f9eb92523266d0e

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/4ee172e66cd76c22da4d3b991f9eb92523266d0e
You're receiving this email because of your account on gitlab.haskell.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.haskell.org/pipermail/ghc-commits/attachments/20201013/35198d19/attachment-0001.html>