From 3c2e0334b78b3f0fab4e49a3e1a682916699f5ab Mon Sep 17 00:00:00 2001
From: Julian Ospald <hasufell@posteo.de>
Date: Tue, 14 Jul 2020 19:07:19 +0200
Subject: [PATCH] Update ghcup binary urls

---
 bootstrap-haskell                | 11 ++++++-----
 ghcup-0.0.2.json                 |  8 ++++----
 lib/GHCup/Data/GHCupDownloads.hs |  8 ++++----
 3 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/bootstrap-haskell b/bootstrap-haskell
index 0eec574..453b394 100755
--- a/bootstrap-haskell
+++ b/bootstrap-haskell
@@ -29,15 +29,16 @@ download_ghcup() {
 	_plat="$(uname -s)"
 	_arch=$(uname -m)
 	_ghver="0.1.6"
+	_base_url="https://downloads.haskell.org/~ghcup"
 
     case "${_plat}" in
         "linux"|"Linux")
 			case "${_arch}" in
 				x86_64|amd64)
-					_url=https://files.hasufell.de/ghcup/${_ghver}/x86_64-linux-ghcup-${_ghver}
+					_url=${_base_url}/${_ghver}/x86_64-linux-ghcup-${_ghver}
 					;;
 				i*86)
-					_url=https://files.hasufell.de/ghcup/${_ghver}/i386-linux-ghcup-${_ghver}
+					_url=${_base_url}/${_ghver}/i386-linux-ghcup-${_ghver}
 					;;
 				*) die "Unknown architecture: ${_arch}"
 					;;
@@ -53,7 +54,7 @@ download_ghcup() {
 				*) die "Unknown architecture: ${_arch}"
 					;;
 			esac
-			_url=https://files.hasufell.de/ghcup/${_ghver}/x86_64-portbld-freebsd-ghcup-${_ghver}
+			_url=${_base_url}/${_ghver}/x86_64-portbld-freebsd-ghcup-${_ghver}
             ;;
         "Darwin"|"darwin")
 			case "${_arch}" in
@@ -65,14 +66,14 @@ download_ghcup() {
 				*) die "Unknown architecture: ${_arch}"
 					;;
 			esac
-			_url=https://files.hasufell.de/ghcup/${_ghver}/x86_64-apple-darwin-ghcup-${_ghver} ;;
+			_url=${_base_url}/${_ghver}/x86_64-apple-darwin-ghcup-${_ghver} ;;
         *) die "Unknown platform: ${_plat}"
 			;;
     esac
 
 	edo curl -Lf "${_url}" > "${GHCUP_INSTALL_BASE_PREFIX}"/.ghcup/bin/ghcup
 
-	unset _plat _arch _url _ghver
+	unset _plat _arch _url _ghver _base_url
 }
 
 
diff --git a/ghcup-0.0.2.json b/ghcup-0.0.2.json
index 49ffd2d..3165a10 100644
--- a/ghcup-0.0.2.json
+++ b/ghcup-0.0.2.json
@@ -2329,21 +2329,21 @@
               "unknown_versioning": {
                 "dlHash": "6bbfb1047691ff3ae9249e8805cf9f37bab30a008dae130cb2a4b3aa5253e6e5",
                 "dlSubdir": null,
-                "dlUri": "https://files.hasufell.de/ghcup/0.1.6/x86_64-portbld-freebsd-ghcup-0.1.6"
+                "dlUri": "https://downloads.haskell.org/~ghcup/0.1.6/x86_64-portbld-freebsd-ghcup-0.1.6"
               }
             },
             "Darwin": {
               "unknown_versioning": {
                 "dlHash": "1e025e66d7f7b75d94f17a7da6120efd7e2df918a8eac88c4711ed11d2aac4ec",
                 "dlSubdir": null,
-                "dlUri": "https://files.hasufell.de/ghcup/0.1.6/x86_64-apple-darwin-ghcup-0.1.6"
+                "dlUri": "https://downloads.haskell.org/~ghcup/0.1.6/x86_64-apple-darwin-ghcup-0.1.6"
               }
             },
             "Linux_UnknownLinux": {
               "unknown_versioning": {
                 "dlHash": "bdbec0cdf4c8511c4082dd83993d15034c0fbcb5722ecf418c1cee40667da8af",
                 "dlSubdir": null,
-                "dlUri": "https://files.hasufell.de/ghcup/0.1.6/x86_64-linux-ghcup-0.1.6"
+                "dlUri": "https://downloads.haskell.org/~ghcup/0.1.6/x86_64-linux-ghcup-0.1.6"
               }
             }
           },
@@ -2352,7 +2352,7 @@
               "unknown_versioning": {
                 "dlHash": "0366ed6c00862c3c002cdefc3e37523ad80e655387956c7ab58b268aaa6fae5d",
                 "dlSubdir": null,
-                "dlUri": "https://files.hasufell.de/ghcup/0.1.6/i386-linux-ghcup-0.1.6"
+                "dlUri": "https://downloads.haskell.org/~ghcup/0.1.6/i386-linux-ghcup-0.1.6"
               }
             }
           }
diff --git a/lib/GHCup/Data/GHCupDownloads.hs b/lib/GHCup/Data/GHCupDownloads.hs
index e8b5142..6a73fd0 100644
--- a/lib/GHCup/Data/GHCupDownloads.hs
+++ b/lib/GHCup/Data/GHCupDownloads.hs
@@ -1041,28 +1041,28 @@ cabal_3200_64_alpine = DownloadInfo
 
 ghcup_016_32_linux :: DownloadInfo
 ghcup_016_32_linux = DownloadInfo
-  [uri|https://files.hasufell.de/ghcup/0.1.6/i386-linux-ghcup-0.1.6|]
+  [uri|https://downloads.haskell.org/~ghcup/0.1.6/i386-linux-ghcup-0.1.6|]
   Nothing
   "0366ed6c00862c3c002cdefc3e37523ad80e655387956c7ab58b268aaa6fae5d"
 
 
 ghcup_016_64_linux :: DownloadInfo
 ghcup_016_64_linux = DownloadInfo
-  [uri|https://files.hasufell.de/ghcup/0.1.6/x86_64-linux-ghcup-0.1.6|]
+  [uri|https://downloads.haskell.org/~ghcup/0.1.6/x86_64-linux-ghcup-0.1.6|]
   Nothing
   "bdbec0cdf4c8511c4082dd83993d15034c0fbcb5722ecf418c1cee40667da8af"
 
 
 ghcup_016_64_freebsd :: DownloadInfo
 ghcup_016_64_freebsd = DownloadInfo
-  [uri|https://files.hasufell.de/ghcup/0.1.6/x86_64-portbld-freebsd-ghcup-0.1.6|]
+  [uri|https://downloads.haskell.org/~ghcup/0.1.6/x86_64-portbld-freebsd-ghcup-0.1.6|]
   Nothing
   "6bbfb1047691ff3ae9249e8805cf9f37bab30a008dae130cb2a4b3aa5253e6e5"
 
 
 ghcup_016_64_darwin10_13 :: DownloadInfo
 ghcup_016_64_darwin10_13 = DownloadInfo
-  [uri|https://files.hasufell.de/ghcup/0.1.6/x86_64-apple-darwin-ghcup-0.1.6|]
+  [uri|https://downloads.haskell.org/~ghcup/0.1.6/x86_64-apple-darwin-ghcup-0.1.6|]
   Nothing
   "1e025e66d7f7b75d94f17a7da6120efd7e2df918a8eac88c4711ed11d2aac4ec"