Fix unpacking of bindists with hardinks pointing to themselves

https://github.com/vmchale/libarchive/issues/14 https://github.com/libarchive/libarchive/issues/1381
Update tarballs
2020-07-20 20:34:36 +02:00 · 2020-07-19 00:50:57 +02:00 · 2020-07-19 00:47:20 +02:00 · 2020-07-16 14:38:19 +02:00 · 2020-07-16 10:57:44 +02:00 · 2020-07-16 00:10:27 +02:00
19 changed files with 470 additions and 149 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,10 @@ dist-newstyle/
 cabal.project.local
 .stack-work/
 bin/
+/*.prof
+/*.ps
+/*.hp
+tags
+TAGS
+/tmp/
+.entangled
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -150,7 +150,7 @@ release:linux:64bit:
    - ./.gitlab/before_script/linux/alpine/install_deps.sh
  variables:
    ARTIFACT: "x86_64-linux-ghcup"
-    GHC_VERSION: "8.10.1"
+    GHC_VERSION: "8.8.3"
    CABAL_VERSION: "3.2.0.0"


@@ -162,7 +162,7 @@ release:linux:32bit:
    - ./.gitlab/before_script/linux/alpine/install_deps.sh
  variables:
    ARTIFACT: "i386-linux-ghcup"
-    GHC_VERSION: "8.10.1"
+    GHC_VERSION: "8.8.3"
    CABAL_VERSION: "3.2.0.0"


@@ -177,7 +177,7 @@ release:darwin:
    - ./.gitlab/before_script/darwin/install_deps.sh
  variables:
    ARTIFACT: "x86_64-apple-darwin-ghcup"
-    GHC_VERSION: "8.10.1"
+    GHC_VERSION: "8.8.3"
    CABAL_VERSION: "3.2.0.0"
    MACOSX_DEPLOYMENT_TARGET: "10.7"

@@ -193,5 +193,6 @@ release:freebsd:
    - ./.gitlab/before_script/freebsd/install_deps.sh
  variables:
    ARTIFACT: "x86_64-portbld-freebsd-ghcup"
-    GHC_VERSION: "8.10.1"
+    GHC_VERSION: "8.8.3"
+    CABAL_VERSION: "3.2.0.0"

--- a/.gitlab/before_script/linux/alpine/install_deps.sh
+++ b/.gitlab/before_script/linux/alpine/install_deps.sh
@@ -23,26 +23,13 @@ ln -sf libncursesw.so.6 /usr/lib/libtinfow.so.6
 ln -sf libtinfow.so.6 /usr/lib/libtinfow.so

 if [ "${BIT}" = "32" ] ; then
-	curl -sSfL https://downloads.haskell.org/~ghcup/0.1.5/i386-linux-ghcup-0.1.5 > ./ghcup-bin
+	curl -sSfL https://downloads.haskell.org/ghcup/i386-linux-ghcup > ./ghcup-bin
 else
-	curl -sSfL https://downloads.haskell.org/~ghcup/0.1.5/x86_64-linux-ghcup-0.1.5 > ./ghcup-bin
+	curl -sSfL https://downloads.haskell.org/ghcup/x86_64-linux-ghcup > ./ghcup-bin
 fi
 chmod +x ghcup-bin
-./ghcup-bin upgrade
 ./ghcup-bin install ${GHC_VERSION}
-# ./ghcup-bin install-cabal ${CABAL_VERSION}
-# install cabal-3.2.0.0
-if [ "${BIT}" = "32" ] ; then
-	curl -sSfL -o cabal-install-3.2.0.0-i386-alpine-linux-musl.tar.xz 'https://hasufell.de/d/d3e215db133e4fcaa61e/files/?p=/cabal-install-3.2.0.0-i386-alpine-linux-musl.tar.xz&dl=1'
-	tar xf cabal-install-3.2.0.0-i386-alpine-linux-musl.tar.xz
-	cp cabal-install-3.2.0.0-i386-alpine-linux-musl "${GHCUP_INSTALL_BASE_PREFIX}/.ghcup/bin/cabal"
-else
-	curl -sSfL -o cabal-install-3.2.0.0-x86_64-alpine-linux-musl.tar.xz 'https://hasufell.de/d/d3e215db133e4fcaa61e/files/?p=/cabal-install-3.2.0.0-x86_64-alpine-linux-musl.tar.xz&dl=1'
-	tar xf cabal-install-3.2.0.0-x86_64-alpine-linux-musl.tar.xz
-	cp cabal-install-3.2.0.0-x86_64-alpine-linux-musl "${GHCUP_INSTALL_BASE_PREFIX}/.ghcup/bin/cabal"
-fi
-chmod +x "${GHCUP_INSTALL_BASE_PREFIX}/.ghcup/bin/cabal"
-
+./ghcup-bin install-cabal ${CABAL_VERSION}

 # utils
 apk add --no-cache \
--- a/.gitlab/script/ghcup_release.sh
+++ b/.gitlab/script/ghcup_release.sh
@@ -22,7 +22,7 @@ if [ "${OS}" = "LINUX" ] ; then
 		ecabal build -w ghc-${GHC_VERSION} --ghc-options='-split-sections -optl-static' -ftui
 	fi
 elif [ "${OS}" = "FREEBSD" ] ; then
-	ecabal build -w ghc-${GHC_VERSION} --ghc-options='-split-sections' --constraint="zlib static"
+	ecabal build -w ghc-${GHC_VERSION} --ghc-options='-split-sections' --constraint="zlib static" -ftui
 else
 	ecabal build -w ghc-${GHC_VERSION} --constraint="zlib static" --constraint="lzma static" -ftui
 fi
--- a/.travis/build.sh
+++ b/.travis/build.sh
@@ -20,5 +20,5 @@ ghcup set 8.8.3
 cabal update
 cabal build --constraint="zlib static" --constraint="lzma static" -ftui
 cp "$(cabal new-exec --verbose=0 --offline sh -- -c 'command -v ghcup')" .
-strip -s ghcup
+strip ./ghcup
 cp ghcup "./${ARTIFACT}"
--- a/3rdparty/libarchive/c/archive_write_disk_posix.c
+++ b/3rdparty/libarchive/c/archive_write_disk_posix.c
@@ -546,6 +546,7 @@ _archive_write_disk_header(struct archive *_a, struct archive_entry *entry)
 {
 	struct archive_write_disk *a = (struct archive_write_disk *)_a;
 	struct fixup_entry *fe;
+	const char *linkname;
 	int ret, r;

 	archive_check_magic(&a->archive, ARCHIVE_WRITE_DISK_MAGIC,
@@ -590,6 +591,17 @@ _archive_write_disk_header(struct archive *_a, struct archive_entry *entry)
 	if (ret != ARCHIVE_OK)
 		return (ret);

+	/*
+	 * Check if we have a hardlink that points to itself.
+	 */
+	linkname = archive_entry_hardlink(a->entry);
+	if (linkname != NULL && strcmp(a->name, linkname) == 0) {
+		archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
+		    "Skipping hardlink pointing to itself: %s",
+		    a->name);
+		return (ARCHIVE_WARN);
+	}
+
 	/*
 	 * Query the umask so we get predictable mode settings.
 	 * This gets done on every call to _write_header in case the
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,15 @@
 # Revision history for ghcup

+## 0.1.6 -- 2020-07-13
+
+* Create a new curses (brick) based TUI, accessible via `ghcup tui` #24
+* Support multiple installed versions of cabal #23
+* Improvements to `ghcup list` (show unavailable bindists for platform)
+* Fix redhat downloads #29
+* Support for hadrian bindists (fixes alpine-8.10.1) #31
+* Add FreeBSD bindists 8.6.5 and 8.8.3
+* Fix memory leak during unpack
+
 ## 0.1.5 -- 2020-04-30

 * Fix errors when PATH variable contains path components that are actually files
--- a/app/ghcup/BrickMain.hs
+++ b/app/ghcup/BrickMain.hs
@@ -205,13 +205,10 @@ install' AppState {..} (_, ListResult {..}) = do
 #if !defined(TAR)
            , ArchiveResult
 #endif
-            , DistroNotFound
            , FileDoesNotExistError
            , CopyError
-            , NoCompatibleArch
            , NoDownload
            , NotInstalled
-            , NoCompatiblePlatform
            , BuildFailed
            , TagNotFound
            , DigestError
@@ -283,7 +280,11 @@ changelog' AppState {..} (_, ListResult {..}) = do
    Nothing -> pure $ Left
      [i|Could not find ChangeLog for #{lTool}, version #{prettyVer lVer}|]
    Just uri -> do
-      exec "xdg-open" True [serializeURIRef' uri] Nothing Nothing >>= \case
+      let cmd = case _rPlatform pfreq of
+                  Darwin  -> "open"
+                  Linux _ -> "xdg-open"
+                  FreeBSD -> "xdg-open"
+      exec cmd True [serializeURIRef' uri] Nothing Nothing >>= \case
        Right _ -> pure $ Right ()
        Left  e -> pure $ Left [i|#{e}|]

--- a/app/ghcup/Main.hs
+++ b/app/ghcup/Main.hs
@@ -1033,7 +1033,10 @@ Report bugs at <https://gitlab.haskell.org/haskell/ghcup-hs/issues>|]
                      runLogger
                        ($(logError) [i|Error fetching download info: #{e}|])
                      exitWith (ExitFailure 2)
-          runLogger $ checkForUpdates dls pfreq
+
+          case optCommand of
+            Upgrade _ _ -> pure ()
+            _ -> runLogger $ checkForUpdates dls pfreq



@@ -1308,9 +1311,14 @@ Make sure to clean up #{tmpdir} afterwards.|])
                  pure ExitSuccess
                Just uri -> do
                  let uri' = T.unpack . decUTF8Safe . serializeURIRef' $ uri
+                      cmd = case _rPlatform pfreq of
+                              Darwin  -> "open"
+                              Linux _ -> "xdg-open"
+                              FreeBSD -> "xdg-open"
+
                  if clOpen
                    then
-                      exec "xdg-open"
+                      exec cmd
                           True
                           [serializeURIRef' uri]
                           Nothing
--- a/33
+++ b/33
@@ -28,16 +28,17 @@ eghcup() {
 download_ghcup() {
 	_plat="$(uname -s)"
 	_arch=$(uname -m)
-	_ghver="0.1.5"
+	_ghver="0.1.6"
+	_base_url="https://downloads.haskell.org/~ghcup"

    case "${_plat}" in
        "linux"|"Linux")
 			case "${_arch}" in
 				x86_64|amd64)
-					_url=https://downloads.haskell.org/~ghcup/${_ghver}/x86_64-linux-ghcup-${_ghver}
+					_url=${_base_url}/${_ghver}/x86_64-linux-ghcup-${_ghver}
 					;;
 				i*86)
-					_url=https://downloads.haskell.org/~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://downloads.haskell.org/~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://downloads.haskell.org/~ghcup/0.1.5/x86_64-apple-darwin-ghcup-0.1.5-p2 ;;
+			_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
 }


@@ -129,10 +130,10 @@ if [ -z "${BOOTSTRAP_HASKELL_NONINTERACTIVE}" ] ; then
    read -r answer </dev/tty
 fi

-eghcup --cache install "${BOOTSTRAP_HASKELL_GHC_VERSION}"
+eghcup --cache install ghc "${BOOTSTRAP_HASKELL_GHC_VERSION}"

-eghcup set "${BOOTSTRAP_HASKELL_GHC_VERSION}"
-eghcup --cache install-cabal "${BOOTSTRAP_HASKELL_CABAL_VERSION}"
+eghcup set ghc "${BOOTSTRAP_HASKELL_GHC_VERSION}"
+eghcup --cache install cabal "${BOOTSTRAP_HASKELL_CABAL_VERSION}"

 edo cabal new-update

@@ -163,6 +164,9 @@ if [ -z "${BOOTSTRAP_HASKELL_NONINTERACTIVE}" ] ; then
 				exit 0
 			fi
 			;;
+		*/fish) # login shell is fish
+			GHCUP_PROFILE_FILE="$HOME/.config/fish/config.fish"
+			MY_SHELL="fish" ;;
 		*) exit 0 ;;
 	esac

@@ -178,7 +182,16 @@ if [ -z "${BOOTSTRAP_HASKELL_NONINTERACTIVE}" ] ; then

        case $next_answer in
            [Yy]*)
-                echo "[ -f \"\${GHCUP_INSTALL_BASE_PREFIX:=\$HOME}/.ghcup/env\" ] && source \"\${GHCUP_INSTALL_BASE_PREFIX:=\$HOME}/.ghcup/env\"" >> "${GHCUP_PROFILE_FILE}"
+				case $MY_SHELL in
+					"") break ;;
+					fish)
+						echo "set -q GHCUP_INSTALL_BASE_PREFIX[1]; or set GHCUP_INSTALL_BASE_PREFIX \$HOME" >> "${GHCUP_PROFILE_FILE}"
+						echo "test -f \$GHCUP_INSTALL_BASE_PREFIX/.ghcup/env ; and set -gx PATH \$HOME/.cabal/bin \$GHCUP_INSTALL_BASE_PREFIX/.ghcup/bin \$PATH" >> "${GHCUP_PROFILE_FILE}"
+						break ;;
+					*)
+						echo "[ -f \"\${GHCUP_INSTALL_BASE_PREFIX:=\$HOME}/.ghcup/env\" ] && source \"\${GHCUP_INSTALL_BASE_PREFIX:=\$HOME}/.ghcup/env\"" >> "${GHCUP_PROFILE_FILE}"
+						break ;;
+				esac
                printf "\\033[0;35m%s\\033[0m\\n" "OK! ${GHCUP_PROFILE_FILE} has been modified. Restart your terminal for the changes to take effect,"
                printf "\\033[0;35m%s\\033[0m\\n" "or type \"source ${GHCUP_INSTALL_BASE_PREFIX}/.ghcup/env\" to apply them in your current terminal session."
                exit 0;;
--- a/ghcup-0.0.2.json
+++ b/ghcup-0.0.2.json
@@ -851,9 +851,9 @@
          "A_64": {
            "Linux_Alpine": {
              "unknown_versioning": {
-                "dlHash": "ec6d0417822c3bfafc7aea0b0402294901231bc5d72dd17a2b849e3f44850695",
+                "dlHash": "76cedc5a9ed9fe259bc7e279defa789f833c5d7144a83915ba8b67371aca481b",
                "dlSubdir": "ghc-8.6.5",
-                "dlUri": "https://github.com/redneb/ghc-alt-libc/releases/download/ghc-8.6.5-musl/ghc-8.6.5-x86_64-unknown-linux-musl.tar.xz"
+                "dlUri": "https://files.hasufell.de/ghc/ghc-8.6.5-x86_64-alpine-linux.tar.xz"
              }
            },
            "FreeBSD": {
@@ -1250,6 +1250,143 @@
          "base-4.13.0.0"
        ]
      },
+      "8.8.4": {
+        "viArch": {
+          "A_64": {
+            "Linux_Alpine": {
+              "unknown_versioning": {
+                "dlHash": "5b8dbe2f2430bd66ddc0572fa5a5b5201b9fb7c9a66e13fd5bfb377a5a891bac",
+                "dlSubdir": "ghc-8.8.4",
+                "dlUri": "https://files.hasufell.de/ghc/ghc-8.8.4-x86_64-alpine-linux.tar.xz"
+              }
+            },
+            "FreeBSD": {
+              "unknown_versioning": {
+                "dlHash": "8cebe5ccf454e82acd1ff52ca57590d1ab0f3f44a981b46257ec12158c8c447e",
+                "dlSubdir": "ghc-8.8.4",
+                "dlUri": "https://files.hasufell.de/ghc/ghc-8.8.4-x86_64-portbld-freebsd.tar.xz"
+              }
+            },
+            "Linux_Debian": {
+              "unknown_versioning": {
+                "dlHash": "4862559d221153caf978f4bf2c15a82c114d1e1f43b298b2ecff2ac94b586d20",
+                "dlSubdir": "ghc-8.8.4",
+                "dlUri": "https://downloads.haskell.org/~ghc/8.8.4/ghc-8.8.4-x86_64-deb9-linux.tar.xz"
+              },
+              "8": {
+                "dlHash": "51a36892f1264744195274187298d13ac62bce2da86d4ddf76d8054ab90f2feb",
+                "dlSubdir": "ghc-8.8.4",
+                "dlUri": "https://downloads.haskell.org/~ghc/8.8.4/ghc-8.8.4-x86_64-deb8-linux.tar.xz"
+              }
+            },
+            "Linux_Ubuntu": {
+              "unknown_versioning": {
+                "dlHash": "f32e37f8aa03e74bad533ae02f62dc27a4521e78199576af490888ba34b515db",
+                "dlSubdir": "ghc-8.8.4",
+                "dlUri": "https://downloads.haskell.org/~ghc/8.8.4/ghc-8.8.4-x86_64-fedora27-linux.tar.xz"
+              },
+              "16.04": {
+                "dlHash": "4862559d221153caf978f4bf2c15a82c114d1e1f43b298b2ecff2ac94b586d20",
+                "dlSubdir": "ghc-8.8.4",
+                "dlUri": "https://downloads.haskell.org/~ghc/8.8.4/ghc-8.8.4-x86_64-deb9-linux.tar.xz"
+              },
+              "18.04": {
+                "dlHash": "4862559d221153caf978f4bf2c15a82c114d1e1f43b298b2ecff2ac94b586d20",
+                "dlSubdir": "ghc-8.8.4",
+                "dlUri": "https://downloads.haskell.org/~ghc/8.8.4/ghc-8.8.4-x86_64-deb9-linux.tar.xz"
+              }
+            },
+            "Darwin": {
+              "unknown_versioning": {
+                "dlHash": "e80a789e9d8cfb41dd87f3284b75432427c4461c1731d220d04ead8733ccdb5e",
+                "dlSubdir": "ghc-8.8.4",
+                "dlUri": "https://downloads.haskell.org/~ghc/8.8.4/ghc-8.8.4-x86_64-apple-darwin.tar.xz"
+              }
+            },
+            "Linux_RedHat": {
+              "unknown_versioning": {
+                "dlHash": "a12aa4b1fd3c64240a8a6d15196d33e1c0e0d55b51ff78c387242126d0ef7910",
+                "dlSubdir": "ghc-8.8.4",
+                "dlUri": "https://downloads.haskell.org/~ghc/8.8.4/ghc-8.8.4-x86_64-centos7-linux.tar.xz"
+              }
+            },
+            "Linux_UnknownLinux": {
+              "unknown_versioning": {
+                "dlHash": "f32e37f8aa03e74bad533ae02f62dc27a4521e78199576af490888ba34b515db",
+                "dlSubdir": "ghc-8.8.4",
+                "dlUri": "https://downloads.haskell.org/~ghc/8.8.4/ghc-8.8.4-x86_64-fedora27-linux.tar.xz"
+              }
+            },
+            "Linux_Mint": {
+              "unknown_versioning": {
+                "dlHash": "4862559d221153caf978f4bf2c15a82c114d1e1f43b298b2ecff2ac94b586d20",
+                "dlSubdir": "ghc-8.8.4",
+                "dlUri": "https://downloads.haskell.org/~ghc/8.8.4/ghc-8.8.4-x86_64-deb9-linux.tar.xz"
+              }
+            },
+            "Linux_Fedora": {
+              "unknown_versioning": {
+                "dlHash": "f32e37f8aa03e74bad533ae02f62dc27a4521e78199576af490888ba34b515db",
+                "dlSubdir": "ghc-8.8.4",
+                "dlUri": "https://downloads.haskell.org/~ghc/8.8.4/ghc-8.8.4-x86_64-fedora27-linux.tar.xz"
+              }
+            },
+            "Linux_CentOS": {
+              "unknown_versioning": {
+                "dlHash": "a12aa4b1fd3c64240a8a6d15196d33e1c0e0d55b51ff78c387242126d0ef7910",
+                "dlSubdir": "ghc-8.8.4",
+                "dlUri": "https://downloads.haskell.org/~ghc/8.8.4/ghc-8.8.4-x86_64-centos7-linux.tar.xz"
+              }
+            },
+            "Linux_AmazonLinux": {
+              "unknown_versioning": {
+                "dlHash": "a12aa4b1fd3c64240a8a6d15196d33e1c0e0d55b51ff78c387242126d0ef7910",
+                "dlSubdir": "ghc-8.8.4",
+                "dlUri": "https://downloads.haskell.org/~ghc/8.8.4/ghc-8.8.4-x86_64-centos7-linux.tar.xz"
+              }
+            }
+          },
+          "A_32": {
+            "Linux_Debian": {
+              "unknown_versioning": {
+                "dlHash": "43dd954910c9027694312cef0aabc7774d102d0422b7172802cfb72f7d5da3a0",
+                "dlSubdir": "ghc-8.8.4",
+                "dlUri": "https://downloads.haskell.org/~ghc/8.8.4/ghc-8.8.4-i386-deb9-linux.tar.xz"
+              }
+            },
+            "Linux_Ubuntu": {
+              "unknown_versioning": {
+                "dlHash": "43dd954910c9027694312cef0aabc7774d102d0422b7172802cfb72f7d5da3a0",
+                "dlSubdir": "ghc-8.8.4",
+                "dlUri": "https://downloads.haskell.org/~ghc/8.8.4/ghc-8.8.4-i386-deb9-linux.tar.xz"
+              }
+            },
+            "Linux_UnknownLinux": {
+              "unknown_versioning": {
+                "dlHash": "43dd954910c9027694312cef0aabc7774d102d0422b7172802cfb72f7d5da3a0",
+                "dlSubdir": "ghc-8.8.4",
+                "dlUri": "https://downloads.haskell.org/~ghc/8.8.4/ghc-8.8.4-i386-deb9-linux.tar.xz"
+              }
+            },
+            "Linux_Mint": {
+              "unknown_versioning": {
+                "dlHash": "43dd954910c9027694312cef0aabc7774d102d0422b7172802cfb72f7d5da3a0",
+                "dlSubdir": "ghc-8.8.4",
+                "dlUri": "https://downloads.haskell.org/~ghc/8.8.4/ghc-8.8.4-i386-deb9-linux.tar.xz"
+              }
+            }
+          }
+        },
+        "viSourceDL": {
+          "dlHash": "f0505e38b2235ff9f1090b51f44d6c8efd371068e5a6bb42a2a6d8b67b5ffc2d",
+          "dlSubdir": "ghc-8.8.4",
+          "dlUri": "https://downloads.haskell.org/~ghc/8.8.4/ghc-8.8.4-src.tar.xz"
+        },
+        "viChangeLog": "https://downloads.haskell.org/~ghc/8.8.4/docs/html/users_guide/8.8.4-notes.html",
+        "viTags": [
+          "base-4.13.0.0"
+        ]
+      },
      "8.4.3": {
        "viArch": {
          "A_64": {
@@ -2322,37 +2459,37 @@
      }
    },
    "GHCup": {
-      "0.1.5": {
+      "0.1.6": {
        "viArch": {
          "A_64": {
            "FreeBSD": {
              "unknown_versioning": {
-                "dlHash": "6dd57cc5958ef3a6ba7de22808d9292d31dada8af95277578b69be35fc090194",
+                "dlHash": "6bbfb1047691ff3ae9249e8805cf9f37bab30a008dae130cb2a4b3aa5253e6e5",
                "dlSubdir": null,
-                "dlUri": "https://downloads.haskell.org/~ghcup/0.1.5/x86_64-portbld-freebsd-ghcup-0.1.5"
+                "dlUri": "https://downloads.haskell.org/~ghcup/0.1.6/x86_64-portbld-freebsd-ghcup-0.1.6"
              }
            },
            "Darwin": {
              "unknown_versioning": {
-                "dlHash": "456770c3b1510d44a0e401e0677faa9f5670ef81a11646f47cbba1b95404e788",
+                "dlHash": "1e025e66d7f7b75d94f17a7da6120efd7e2df918a8eac88c4711ed11d2aac4ec",
                "dlSubdir": null,
-                "dlUri": "https://downloads.haskell.org/~ghcup/0.1.5/x86_64-apple-darwin-ghcup-0.1.5-p2"
+                "dlUri": "https://downloads.haskell.org/~ghcup/0.1.6/x86_64-apple-darwin-ghcup-0.1.6"
              }
            },
            "Linux_UnknownLinux": {
              "unknown_versioning": {
-                "dlHash": "cfdb01dde77121859b5d90b6707238b54e23787fcbb3003e18ab52a5dbfee330",
+                "dlHash": "bdbec0cdf4c8511c4082dd83993d15034c0fbcb5722ecf418c1cee40667da8af",
                "dlSubdir": null,
-                "dlUri": "https://downloads.haskell.org/~ghcup/0.1.5/x86_64-linux-ghcup-0.1.5"
+                "dlUri": "https://downloads.haskell.org/~ghcup/0.1.6/x86_64-linux-ghcup-0.1.6"
              }
            }
          },
          "A_32": {
            "Linux_UnknownLinux": {
              "unknown_versioning": {
-                "dlHash": "3707f60d703912709335dc0103fb1af5e5dfa83050825a8156b56bc81760b2a8",
+                "dlHash": "0366ed6c00862c3c002cdefc3e37523ad80e655387956c7ab58b268aaa6fae5d",
                "dlSubdir": null,
-                "dlUri": "https://downloads.haskell.org/~ghcup/0.1.5/i386-linux-ghcup-0.1.5"
+                "dlUri": "https://downloads.haskell.org/~ghcup/0.1.6/i386-linux-ghcup-0.1.6"
              }
            }
          }
--- a/ghcup.cabal
+++ b/ghcup.cabal
@@ -1,6 +1,6 @@
 cabal-version:      3.0
 name:               ghcup
-version:            0.1.5
+version:            0.1.6
 synopsis:           ghc toolchain installer as an exe/library
 description:
  A rewrite of the shell script ghcup, for providing
--- a/lib/GHCup.hs
+++ b/lib/GHCup.hs
@@ -50,7 +50,7 @@ import           Data.Versions
 import           Data.Word8
 import           GHC.IO.Exception
 import           HPath
-import           HPath.IO
+import           HPath.IO                hiding ( hideError )
 import           Haskus.Utils.Variant.Excepts
 import           Optics
 import           Prelude                 hiding ( abs
--- a/lib/GHCup/Data/GHCupDownloads.hs
+++ b/lib/GHCup/Data/GHCupDownloads.hs
@@ -652,11 +652,11 @@ ghc_865_64_darwin = DownloadInfo
  (Just [rel|ghc-8.6.5|])
  "dfc1bdb1d303a87a8552aa17f5b080e61351f2823c2b99071ec23d0837422169"

-ghc_865_64_musl :: DownloadInfo
-ghc_865_64_musl = DownloadInfo
-  [uri|https://github.com/redneb/ghc-alt-libc/releases/download/ghc-8.6.5-musl/ghc-8.6.5-x86_64-unknown-linux-musl.tar.xz|]
+ghc_865_64_alpine :: DownloadInfo
+ghc_865_64_alpine = DownloadInfo
+  [uri|https://files.hasufell.de/ghc/ghc-8.6.5-x86_64-alpine-linux.tar.xz|]
  (Just [rel|ghc-8.6.5|])
-  "ec6d0417822c3bfafc7aea0b0402294901231bc5d72dd17a2b849e3f44850695"
+  "76cedc5a9ed9fe259bc7e279defa789f833c5d7144a83915ba8b67371aca481b"

 ghc_865_32_musl :: DownloadInfo
 ghc_865_32_musl = DownloadInfo
@@ -846,6 +846,62 @@ ghc_883_64_freebsd = DownloadInfo



+    -----------------
+    --[ GHC 8.8.4 ]--
+    -----------------
+
+
+
+ghc_884_64_deb8 :: DownloadInfo
+ghc_884_64_deb8 = DownloadInfo
+  [uri|https://downloads.haskell.org/~ghc/8.8.4/ghc-8.8.4-x86_64-deb8-linux.tar.xz|]
+  (Just [rel|ghc-8.8.4|])
+  "51a36892f1264744195274187298d13ac62bce2da86d4ddf76d8054ab90f2feb"
+
+ghc_884_64_deb9 :: DownloadInfo
+ghc_884_64_deb9 = DownloadInfo
+  [uri|https://downloads.haskell.org/~ghc/8.8.4/ghc-8.8.4-x86_64-deb9-linux.tar.xz|]
+  (Just [rel|ghc-8.8.4|])
+  "4862559d221153caf978f4bf2c15a82c114d1e1f43b298b2ecff2ac94b586d20"
+
+ghc_884_32_deb9 :: DownloadInfo
+ghc_884_32_deb9 = DownloadInfo
+  [uri|https://downloads.haskell.org/~ghc/8.8.4/ghc-8.8.4-i386-deb9-linux.tar.xz|]
+  (Just [rel|ghc-8.8.4|])
+  "43dd954910c9027694312cef0aabc7774d102d0422b7172802cfb72f7d5da3a0"
+
+ghc_884_64_fedora :: DownloadInfo
+ghc_884_64_fedora = DownloadInfo
+  [uri|https://downloads.haskell.org/~ghc/8.8.4/ghc-8.8.4-x86_64-fedora27-linux.tar.xz|]
+  (Just [rel|ghc-8.8.4|])
+  "f32e37f8aa03e74bad533ae02f62dc27a4521e78199576af490888ba34b515db"
+
+ghc_884_64_centos :: DownloadInfo
+ghc_884_64_centos = DownloadInfo
+  [uri|https://downloads.haskell.org/~ghc/8.8.4/ghc-8.8.4-x86_64-centos7-linux.tar.xz|]
+  (Just [rel|ghc-8.8.4|])
+  "a12aa4b1fd3c64240a8a6d15196d33e1c0e0d55b51ff78c387242126d0ef7910"
+
+ghc_884_64_darwin :: DownloadInfo
+ghc_884_64_darwin = DownloadInfo
+  [uri|https://downloads.haskell.org/~ghc/8.8.4/ghc-8.8.4-x86_64-apple-darwin.tar.xz|]
+  (Just [rel|ghc-8.8.4|])
+  "e80a789e9d8cfb41dd87f3284b75432427c4461c1731d220d04ead8733ccdb5e"
+
+ghc_884_64_freebsd :: DownloadInfo
+ghc_884_64_freebsd = DownloadInfo
+  [uri|https://files.hasufell.de/ghc/ghc-8.8.4-x86_64-portbld-freebsd.tar.xz|]
+  (Just [rel|ghc-8.8.4|])
+  "8cebe5ccf454e82acd1ff52ca57590d1ab0f3f44a981b46257ec12158c8c447e"
+
+ghc_884_64_alpine :: DownloadInfo
+ghc_884_64_alpine = DownloadInfo
+  [uri|https://files.hasufell.de/ghc/ghc-8.8.4-x86_64-alpine-linux.tar.xz|]
+  (Just [rel|ghc-8.8.4|])
+  "5b8dbe2f2430bd66ddc0572fa5a5b5201b9fb7c9a66e13fd5bfb377a5a891bac"
+
+
+
    -----------------
    --[ GHC 8.10.1 ]--
    -----------------
@@ -1039,32 +1095,32 @@ cabal_3200_64_alpine = DownloadInfo
    -------------


-ghcup_015_32_linux :: DownloadInfo
-ghcup_015_32_linux = DownloadInfo
-  [uri|https://downloads.haskell.org/~ghcup/0.1.5/i386-linux-ghcup-0.1.5|]
+ghcup_016_32_linux :: DownloadInfo
+ghcup_016_32_linux = DownloadInfo
+  [uri|https://downloads.haskell.org/~ghcup/0.1.6/i386-linux-ghcup-0.1.6|]
  Nothing
-  "3707f60d703912709335dc0103fb1af5e5dfa83050825a8156b56bc81760b2a8"
+  "0366ed6c00862c3c002cdefc3e37523ad80e655387956c7ab58b268aaa6fae5d"


-ghcup_015_64_linux :: DownloadInfo
-ghcup_015_64_linux = DownloadInfo
-  [uri|https://downloads.haskell.org/~ghcup/0.1.5/x86_64-linux-ghcup-0.1.5|]
+ghcup_016_64_linux :: DownloadInfo
+ghcup_016_64_linux = DownloadInfo
+  [uri|https://downloads.haskell.org/~ghcup/0.1.6/x86_64-linux-ghcup-0.1.6|]
  Nothing
-  "cfdb01dde77121859b5d90b6707238b54e23787fcbb3003e18ab52a5dbfee330"
+  "bdbec0cdf4c8511c4082dd83993d15034c0fbcb5722ecf418c1cee40667da8af"


-ghcup_015_64_freebsd :: DownloadInfo
-ghcup_015_64_freebsd = DownloadInfo
-  [uri|https://downloads.haskell.org/~ghcup/0.1.5/x86_64-portbld-freebsd-ghcup-0.1.5|]
+ghcup_016_64_freebsd :: DownloadInfo
+ghcup_016_64_freebsd = DownloadInfo
+  [uri|https://downloads.haskell.org/~ghcup/0.1.6/x86_64-portbld-freebsd-ghcup-0.1.6|]
  Nothing
-  "6dd57cc5958ef3a6ba7de22808d9292d31dada8af95277578b69be35fc090194"
+  "6bbfb1047691ff3ae9249e8805cf9f37bab30a008dae130cb2a4b3aa5253e6e5"


-ghcup_015_64_darwin10_13 :: DownloadInfo
-ghcup_015_64_darwin10_13 = DownloadInfo
-  [uri|https://downloads.haskell.org/~ghcup/0.1.5/x86_64-apple-darwin-ghcup-0.1.5-p2|]
+ghcup_016_64_darwin10_13 :: DownloadInfo
+ghcup_016_64_darwin10_13 = DownloadInfo
+  [uri|https://downloads.haskell.org/~ghcup/0.1.6/x86_64-apple-darwin-ghcup-0.1.6|]
  Nothing
-  "456770c3b1510d44a0e401e0677faa9f5670ef81a11646f47cbba1b95404e788"
+  "1e025e66d7f7b75d94f17a7da6120efd7e2df918a8eac88c4711ed11d2aac4ec"



@@ -1652,8 +1708,8 @@ ghcupDownloads = M.fromList
                      ]
                    )
                  , (Darwin      , M.fromList [(Nothing, ghc_865_64_darwin)])
-                  , (Linux Alpine, M.fromList [(Nothing, ghc_865_64_musl)])
-                  , (FreeBSD, M.fromList [(Nothing, ghc_865_64_freebsd)])
+                  , (Linux Alpine, M.fromList [(Nothing, ghc_865_64_alpine)])
+                  , (FreeBSD     , M.fromList [(Nothing, ghc_865_64_freebsd)])
                  ]
                )
              , ( A_32
@@ -1832,6 +1888,60 @@ ghcupDownloads = M.fromList
                )
              ]
        )
+      , ( [vver|8.8.4|]
+        , VersionInfo
+            [Base [pver|4.13.0.0|]]
+            (Just
+              [uri|https://downloads.haskell.org/~ghc/8.8.4/docs/html/users_guide/8.8.4-notes.html|]
+            )
+            (Just $ DownloadInfo
+              [uri|https://downloads.haskell.org/~ghc/8.8.4/ghc-8.8.4-src.tar.xz|]
+              (Just [rel|ghc-8.8.4|])
+              "f0505e38b2235ff9f1090b51f44d6c8efd371068e5a6bb42a2a6d8b67b5ffc2d"
+            )
+          $ M.fromList
+              [ ( A_64
+                , M.fromList
+                  [ ( Linux UnknownLinux
+                    , M.fromList [(Nothing, ghc_884_64_fedora)]
+                    )
+                  , (Linux Fedora, M.fromList [(Nothing, ghc_884_64_fedora)])
+                  , (Linux CentOS, M.fromList [(Nothing, ghc_884_64_centos)])
+                  , (Linux RedHat, M.fromList [(Nothing, ghc_884_64_centos)])
+                  , ( Linux AmazonLinux
+                    , M.fromList [(Nothing, ghc_884_64_centos)]
+                    )
+                  , ( Linux Ubuntu
+                    , M.fromList
+                      [ (Nothing           , ghc_884_64_fedora)
+                      , (Just [vers|16.04|], ghc_884_64_deb9)
+                      , (Just [vers|18.04|], ghc_884_64_deb9)
+                      ]
+                    )
+                  , (Linux Mint, M.fromList [(Nothing, ghc_884_64_deb9)])
+                  , ( Linux Debian
+                    , M.fromList
+                      [ (Nothing       , ghc_884_64_deb9)
+                      , (Just [vers|8|], ghc_884_64_deb8)
+                      ]
+                    )
+                  , (Darwin, M.fromList [(Nothing, ghc_884_64_darwin)])
+                  , (Linux Alpine, M.fromList [(Nothing, ghc_884_64_alpine)])
+                  , (FreeBSD     , M.fromList [(Nothing, ghc_884_64_freebsd)])
+                  ]
+                )
+              , ( A_32
+                , M.fromList
+                  [ ( Linux UnknownLinux
+                    , M.fromList [(Nothing, ghc_884_32_deb9)]
+                    )
+                  , (Linux Ubuntu, M.fromList [(Nothing, ghc_884_32_deb9)])
+                  , (Linux Mint  , M.fromList [(Nothing, ghc_884_32_deb9)])
+                  , (Linux Debian, M.fromList [(Nothing, ghc_884_32_deb9)])
+                  ]
+                )
+              ]
+        )
      , ( [vver|8.10.1|]
        , VersionInfo
            [Latest, Base [pver|4.14.0.0|]]
@@ -2005,7 +2115,7 @@ ghcupDownloads = M.fromList
    )
  , ( GHCup
    , M.fromList
-      [ ( [vver|0.1.5|]
+      [ ( [vver|0.1.6|]
        , VersionInfo
            [Recommended, Latest]
            (Just
@@ -2016,16 +2126,16 @@ ghcupDownloads = M.fromList
              [ ( A_64
                , M.fromList
                  [ ( Linux UnknownLinux
-                    , M.fromList [(Nothing, ghcup_015_64_linux)]
+                    , M.fromList [(Nothing, ghcup_016_64_linux)]
                    )
-                  , (Darwin , M.fromList [(Nothing, ghcup_015_64_darwin10_13)])
-                  , (FreeBSD, M.fromList [(Nothing, ghcup_015_64_freebsd)])
+                  , (Darwin , M.fromList [(Nothing, ghcup_016_64_darwin10_13)])
+                  , (FreeBSD, M.fromList [(Nothing, ghcup_016_64_freebsd)])
                  ]
                )
              , ( A_32
                , M.fromList
                  [ ( Linux UnknownLinux
-                    , M.fromList [(Nothing, ghcup_015_32_linux)]
+                    , M.fromList [(Nothing, ghcup_016_32_linux)]
                    )
                  ]
                )
--- a/lib/GHCup/Download.hs
+++ b/lib/GHCup/Download.hs
@@ -50,7 +50,7 @@ import           Data.Versions
 import           Data.Word8
 import           GHC.IO.Exception
 import           HPath
-import           HPath.IO                      as HIO
+import           HPath.IO                     as HIO hiding ( hideError )
 import           Haskus.Utils.Variant.Excepts
 import           Optics
 import           Prelude                 hiding ( abs
--- a/lib/GHCup/Utils.hs
+++ b/lib/GHCup/Utils.hs
@@ -45,7 +45,7 @@ import           Data.Versions
 import           Data.Word8
 import           GHC.IO.Exception
 import           HPath
-import           HPath.IO
+import           HPath.IO                hiding ( hideError )
 import           Haskus.Utils.Variant.Excepts
 import           Optics
 import           Prelude                 hiding ( abs
--- a/lib/GHCup/Utils/File.hs
+++ b/lib/GHCup/Utils/File.hs
@@ -14,17 +14,20 @@ import           Control.Exception              ( evaluate )
 import           Control.Exception.Safe
 import           Control.Monad
 import           Control.Monad.Reader
+import           Control.Monad.Trans.State.Strict
 import           Data.ByteString                ( ByteString )
 import           Data.Foldable
 import           Data.Functor
 import           Data.IORef
 import           Data.Maybe
+import           Data.Sequence                  ( Seq, (|>) )
 import           Data.Text                      ( Text )
 import           Data.Void
+import           Data.Word8
 import           GHC.IO.Exception
 import           HPath
-import           HPath.IO
-import           Optics
+import           HPath.IO                hiding ( hideError )
+import           Optics                  hiding ((<|), (|>))
 import           System.Console.Pretty
 import           System.Console.Regions
 import           System.IO.Error
@@ -40,6 +43,7 @@ import           Text.Regex.Posix


 import qualified Control.Exception             as EX
+import qualified Data.Sequence                 as Sq
 import qualified Data.Text                     as T
 import qualified Data.Text.Encoding            as E
 import qualified System.Posix.Process.ByteString
@@ -53,6 +57,7 @@ import qualified "unix-bytestring" System.Posix.IO.ByteString



+
 -- | Bool signals whether the regions should be cleaned.
 data StopThread = StopThread Bool
  deriving Show
@@ -113,115 +118,140 @@ execLogged :: (MonadReader Settings m, MonadIO m, MonadThrow m)
           -> Maybe [(ByteString, ByteString)] -- ^ optional environment
           -> m (Either ProcessError ())
 execLogged exe spath args lfile chdir env = do
-  Settings{..} <- ask
-  ldir    <- liftIO ghcupLogsDir
-  logfile <- (ldir </>) <$> parseRel (toFilePath lfile <> ".log")
-  liftIO $ bracket (createFile (toFilePath logfile) newFilePerms) closeFd (action verbose)
+  Settings {..} <- ask
+  ldir          <- liftIO ghcupLogsDir
+  logfile       <- (ldir </>) <$> parseRel (toFilePath lfile <> ".log")
+  liftIO $ bracket (createFile (toFilePath logfile) newFilePerms)
+                   closeFd
+                   (action verbose)
 where
  action verbose fd = do
    actionWithPipes $ \(stdoutRead, stdoutWrite) -> do
-      -- start the thread that logs to stdout in a region
-      done <- newEmptyMVar
-      tid  <-
-        forkIO
+      -- start the thread that logs to stdout
+      pState <- newEmptyMVar
+      done   <- newEmptyMVar
+      void
+        $ forkOS
        $ EX.handle (\(_ :: StopThread) -> pure ())
        $ EX.handle (\(_ :: IOException) -> pure ())
        $ flip finally (putMVar done ())
-        $ (if verbose then tee fd stdoutRead else printToRegion fd stdoutRead 6)
+        $ (if verbose
+            then tee fd stdoutRead
+            else printToRegion fd stdoutRead 6 pState
+          )

-      -- fork our subprocess
+      -- fork the subprocess
      pid <- SPPB.forkProcess $ do
        void $ dupTo stdoutWrite stdOutput
        void $ dupTo stdoutWrite stdError
-        closeFd stdoutWrite
        closeFd stdoutRead
+        closeFd stdoutWrite

        -- execute the action
        maybe (pure ()) (changeWorkingDirectory . toFilePath) chdir
-        SPPB.executeFile exe spath args env
+        void $ SPPB.executeFile exe spath args env

      closeFd stdoutWrite

      -- wait for the subprocess to finish
-      e <- SPPB.getProcessStatus True True pid >>= \case
-        i@(Just (SPPB.Exited _)) -> pure $ toProcessError exe args i
-        i                        -> pure $ toProcessError exe args i
+      e <- toProcessError exe args <$!> SPPB.getProcessStatus True True pid
+      putMVar pState (either (const False) (const True) e)

-      -- make sure the logging thread stops
-      case e of
-        Left  _ -> EX.throwTo tid (StopThread False)
-        Right _ -> EX.throwTo tid (StopThread True)
      takeMVar done
-
      closeFd stdoutRead
+
      pure e

-  tee fileFd fdIn = do
-      flip finally (readTilEOF lineAction fdIn) -- make sure the last few lines don't get cut off
-        $ do
-            hideError eofErrorType $ readTilEOF lineAction fdIn
-            forever (threadDelay 5000)
+  tee :: Fd -> Fd -> IO ()
+  tee fileFd fdIn = readTilEOF lineAction fdIn

   where
+    lineAction :: ByteString -> IO ()
    lineAction bs' = do
      void $ SPIB.fdWrite fileFd (bs' <> "\n")
      void $ SPIB.fdWrite stdOutput (bs' <> "\n")

  -- Reads fdIn and logs the output in a continous scrolling area
  -- of 'size' terminal lines. Also writes to a log file.
-  printToRegion fileFd fdIn size = do
-    ref <- newIORef ([] :: [ByteString])
-    displayConsoleRegions $ do
-      rs <- sequence . replicate size . openConsoleRegion $ Linear
-      flip finally (readTilEOF (lineAction ref rs) fdIn) -- make sure the last few lines don't get cut off
+  printToRegion :: Fd -> Fd -> Int -> MVar Bool -> IO ()
+  printToRegion fileFd fdIn size pState = do
+    void $ displayConsoleRegions $ do
+      rs <-
+        liftIO
+        . fmap Sq.fromList
+        . sequence
+        . replicate size
+        . openConsoleRegion
+        $ Linear
+      flip runStateT mempty
        $ handle
-            (\(StopThread b) -> do
-              when b (forM_ rs closeConsoleRegion)
-              EX.throw (StopThread b)
+            (\(ex :: SomeException) -> do
+              ps <- liftIO $ takeMVar pState
+              when (ps == True) (forM_ rs (liftIO . closeConsoleRegion))
+              throw ex
            )
-        $ do
-            hideError eofErrorType $ readTilEOF (lineAction ref rs) fdIn
-            -- wait for explicit stop from the parent to signal what cleanup to run
-            forever (threadDelay 5000)
+        $ readTilEOF (lineAction rs) fdIn

   where
    -- action to perform line by line
    -- TODO: do this with vty for efficiency
-    lineAction ref rs bs' = do
-      modifyIORef' ref (swapRegs bs')
-      regs <- readIORef ref
-      void $ SPIB.fdWrite fileFd (bs' <> "\n")
-      forM (zip regs rs) $ \(bs, r) -> do
-        setConsoleRegion r $ do
-          w <- consoleWidth
-          return
-            . T.pack
-            . color Blue
-            . T.unpack
-            . decUTF8Safe
-            . trim w
-            . (\b -> "[ " <> toFilePath lfile <> " ] " <> b)
-            $ bs
+    lineAction :: (MonadMask m, MonadIO m)
+               => Seq ConsoleRegion
+               -> ByteString
+               -> StateT (Seq ByteString) m ()
+    lineAction rs = \bs' -> do
+      void $ liftIO $ SPIB.fdWrite fileFd (bs' <> "\n")
+      modify (swapRegs bs')
+      regs <- get
+      liftIO $ forM_ (Sq.zip regs rs) $ \(bs, r) -> setConsoleRegion r $ do
+        w <- consoleWidth
+        return
+          . T.pack
+          . color Blue
+          . T.unpack
+          . decUTF8Safe
+          . trim w
+          . (\b -> "[ " <> toFilePath lfile <> " ] " <> b)
+          $ bs

-    swapRegs bs regs | length regs < size = regs ++ [bs]
-                     | otherwise          = tail regs ++ [bs]
+    swapRegs :: a -> Seq a -> Seq a
+    swapRegs bs = \regs -> if
+      | Sq.length regs < size -> regs |> bs
+      | otherwise             -> Sq.drop 1 regs |> bs

    -- trim output line to terminal width
-    trim w bs | BS.length bs > w && w > 5 = BS.take (w - 4) bs <> "..."
-              | otherwise                 = bs
+    trim :: Int -> ByteString -> ByteString
+    trim w = \bs -> if
+      | BS.length bs > w && w > 5 -> BS.take (w - 4) bs <> "..."
+      | otherwise                 -> bs

  -- read an entire line from the file descriptor (removes the newline char)
-  readLine fd' = do
-    bs <- SPIB.fdRead fd' 1
-    if
-      | bs == "\n" -> pure ""
-      | bs == ""   -> pure ""
-      | otherwise  -> fmap (bs <>) $ readLine fd'
+  readLine :: MonadIO m => Fd -> ByteString -> m (ByteString, ByteString)
+  readLine fd = go
+   where
+    go inBs = do
+      bs <-
+        liftIO
+        $ handleIO (\e -> if isEOFError e then pure "" else ioError e)
+        $ SPIB.fdRead fd 512
+      let nbs          = BS.append inBs bs
+          (line, rest) = BS.span (/= _lf) nbs
+      if
+        | BS.length rest /= 0 -> pure (line, BS.tail rest)
+        | BS.length line == 0 -> pure (mempty, mempty)
+        | otherwise           -> (\(l, r) -> (line <> l, r)) <$!> go mempty

-  readTilEOF action' fd' = do
-    bs <- readLine fd'
-    void $ action' bs
-    readTilEOF action' fd'
+  readTilEOF :: MonadIO m => (ByteString -> m a) -> Fd -> m ()
+  readTilEOF ~action' fd' = go mempty
+   where
+    go bs' = do
+      (bs, rest) <- readLine fd' bs'
+      if
+        | BS.length bs == 0 -> liftIO
+        $ ioError (mkIOError eofErrorType "" Nothing Nothing)
+        | otherwise -> do
+          void $ action' bs
+          go rest


 -- | Capture the stdout and stderr of the given action, which
--- a/lib/GHCup/Utils/Prelude.hs
+++ b/lib/GHCup/Utils/Prelude.hs
@@ -165,6 +165,11 @@ liftIOException errType ex =
    . lift


+-- | Uses safe-exceptions.
+hideError :: (MonadIO m, MonadCatch m) => IOErrorType -> m () -> m ()
+hideError err = handleIO (\e -> if err == ioeGetErrorType e then pure () else liftIO . ioError $ e)
+
+
 hideErrorDef :: [IOErrorType] -> a -> IO a -> IO a
 hideErrorDef errs def =
  handleIO (\e -> if ioeGetErrorType e `elem` errs then pure def else ioError e)
--- a/lib/GHCup/Version.hs
+++ b/lib/GHCup/Version.hs
@@ -16,7 +16,7 @@ ghcupURL :: URI
 ghcupURL = [uri|https://www.haskell.org/ghcup/data/ghcup-0.0.2.json|]

 ghcUpVer :: PVP
-ghcUpVer = [pver|0.1.5|]
+ghcUpVer = [pver|0.1.6|]

 numericVer :: String
 numericVer = T.unpack . prettyPVP $ ghcUpVer
Author	SHA1	Message	Date
Julian Ospald	2c638cd2e2	Fix unpacking of bindists with hardinks pointing to themselves https://github.com/vmchale/libarchive/issues/14 https://github.com/libarchive/libarchive/issues/1381	2020-07-20 20:34:36 +02:00
Julian Ospald	3ecdb63063	Update tarballs	2020-07-19 00:50:57 +02:00
Julian Ospald	cfe24428fa	Only check for upgrades when not upgrading	2020-07-19 00:47:20 +02:00
Julian Ospald	4c4266dd8c	Add GHC-8.8.4 for FreeBSD	2020-07-16 14:38:19 +02:00
Julian Ospald	e8336bbc8a	Add GHC-8.8.4	2020-07-16 10:57:44 +02:00
Julian Ospald	0f69c73e0e	Rework printing/tee This should be faster to draw, use less syscalls and generally use EOF and pipes correctly.	2020-07-16 00:10:27 +02:00
Julian Ospald	e348de8dc4	Drop unused error variants	2020-07-14 19:16:01 +02:00
Julian Ospald	55a3ba9be2	Improve fish support in bootstrap-haskell	2020-07-14 19:08:20 +02:00
Julian Ospald	51b29b81b0	Use new-style ghcup commands in bootstrap-haskell	2020-07-14 19:07:57 +02:00
Julian Ospald	3c2e0334b7	Update ghcup binary urls	2020-07-14 19:07:19 +02:00
Julian Ospald	0679626514	Self host ghcup binaries	2020-07-14 14:29:23 +02:00
Julian Ospald	5035051135	Update 0.1.6	2020-07-13 23:50:11 +02:00
Julian Ospald	63c70ee74b	Fix changelog subcommand on darwin	2020-07-13 23:10:17 +02:00
Julian Ospald	2e0bbca2e0	Fix freebsd tui	2020-07-13 22:45:38 +02:00
Julian Ospald	b52fa23ca2	Update alpine install-deps	2020-07-13 22:34:38 +02:00
Julian Ospald	ba03b78f23	Update ghcup binaries	2020-07-13 22:15:39 +02:00
Julian Ospald	04ef472c15	Fix freebsd gitlab-ci	2020-07-13 21:29:13 +02:00
Julian Ospald	75cd8f2341	Fix stripping in travis	2020-07-13 21:17:01 +02:00
Julian Ospald	f2e26c1800	Fix release build	2020-07-13 20:48:37 +02:00
Julian Ospald	0f7dd597d2	Update .gitignore	2020-07-13 20:37:34 +02:00
Julian Ospald	fb0eba9201	Release 0.1.6	2020-07-13 20:31:14 +02:00
Julian Ospald	3c80929c38	Merge branch 'ghc-8.10.1'	2020-07-13 20:06:17 +02:00