Silence hlint

Fixes #353

lib/GHCup.hs

@@ -2603,7 +2603,7 @@ upgradeGHCup mtarget force' = do
   GHCupInfo { _ghcupDownloads = dls } <- lift getGHCupInfo
 
   lift $ logInfo "Upgrading GHCup..."
-  let latestVer = fromJust $ fst <$> getLatest dls GHCup
+  let latestVer = fst (fromJust (getLatest dls GHCup))
   (Just ghcupPVPVer) <- pure $ pvpToVersion ghcUpVer ""
   when (not force' && (latestVer <= ghcupPVPVer)) $ throwE NoUpdate
   dli   <- liftE $ getDownloadInfo GHCup latestVer

lib/GHCup/Utils.hs

@@ -317,10 +317,10 @@ ghcSet mtarget = do
            MP.setInput rest
            pure x
          )
-        <* pathSep
+        <* MP.some pathSep
         <* MP.takeRest
         <* MP.eof
-    ghcSubPath = pathSep <* MP.chunk "ghc" *> pathSep
+    ghcSubPath = MP.some pathSep <* MP.chunk "ghc" *> MP.some pathSep
 
 -- | Get all installed GHCs by reading ~/.ghcup/ghc/<dir>.
 -- If a dir cannot be parsed, returns left.
@@ -398,10 +398,10 @@ cabalSet = do
   cabalParse = MP.chunk "cabal-" *> version'
   -- parses any path component ending with path separator,
   -- e.g. "foo/"
-  stripPathComponet = parseUntil1 pathSep *> pathSep
+  stripPathComponet = parseUntil1 pathSep *> MP.some pathSep
   -- parses an absolute path up until the last path separator,
   -- e.g. "/bar/baz/foo" -> "/bar/baz/", leaving "foo"
-  stripAbsolutePath = pathSep *> MP.many (MP.try stripPathComponet)
+  stripAbsolutePath = MP.some pathSep *> MP.many (MP.try stripPathComponet)
   -- parses a relative path up until the last path separator,
   -- e.g. "bar/baz/foo" -> "bar/baz/", leaving "foo"
   stripRelativePath = MP.many (MP.try stripPathComponet)
@@ -492,10 +492,10 @@ stackSet = do
     cabalParse = MP.chunk "stack-" *> version'
     -- parses any path component ending with path separator,
     -- e.g. "foo/"
-    stripPathComponet = parseUntil1 pathSep *> pathSep
+    stripPathComponet = parseUntil1 pathSep *> MP.some pathSep
     -- parses an absolute path up until the last path separator,
     -- e.g. "/bar/baz/foo" -> "/bar/baz/", leaving "foo"
-    stripAbsolutePath = pathSep *> MP.many (MP.try stripPathComponet)
+    stripAbsolutePath = MP.some pathSep *> MP.many (MP.try stripPathComponet)
     -- parses a relative path up until the last path separator,
     -- e.g. "bar/baz/foo" -> "bar/baz/", leaving "foo"
     stripRelativePath = MP.many (MP.try stripPathComponet)
@@ -543,10 +543,10 @@ hlsSet = do
     cabalParse = MP.chunk "haskell-language-server-wrapper-" *> version'
     -- parses any path component ending with path separator,
     -- e.g. "foo/"
-    stripPathComponet = parseUntil1 pathSep *> pathSep
+    stripPathComponet = parseUntil1 pathSep *> MP.some pathSep
     -- parses an absolute path up until the last path separator,
     -- e.g. "/bar/baz/foo" -> "/bar/baz/", leaving "foo"
-    stripAbsolutePath = pathSep *> MP.many (MP.try stripPathComponet)
+    stripAbsolutePath = MP.some pathSep *> MP.many (MP.try stripPathComponet)
     -- parses a relative path up until the last path separator,
     -- e.g. "bar/baz/foo" -> "bar/baz/", leaving "foo"
     stripRelativePath = MP.many (MP.try stripPathComponet)

scripts/bootstrap/bootstrap-haskell

@@ -126,10 +126,10 @@ _eghcup() {
 	fi
     if [ -z "${BOOTSTRAP_HASKELL_VERBOSE}" ] ; then
         # shellcheck disable=SC2086
-        "ghcup" ${args} "$@"
+        "${GHCUP_BIN}/ghcup" ${args} "$@"
     else
         # shellcheck disable=SC2086
-        "ghcup" ${args} --verbose "$@"
+        "${GHCUP_BIN}/ghcup" ${args} --verbose "$@"
     fi
 }
 
@@ -228,100 +228,99 @@ posix_realpath() {
 }
 
 download_ghcup() {
-    if ! command -V "ghcup" >/dev/null 2>&1 ; then
-        case "${plat}" in
-            "linux"|"Linux")
-                case "${arch}" in
-                    x86_64|amd64)
-                        # we could be in a 32bit docker container, in which
-                        # case uname doesn't give us what we want
-                        if [ "$(getconf LONG_BIT)" = "32" ] ; then
-                            _url=${GHCUP_BASE_URL}/${ghver}/i386-linux-ghcup-${ghver}
-                        elif [ "$(getconf LONG_BIT)" = "64" ] ; then
-                            _url=${GHCUP_BASE_URL}/${ghver}/x86_64-linux-ghcup-${ghver}
-                        else
-                            die "Unknown long bit size: $(getconf LONG_BIT)"
-                        fi
-                        ;;
-                    i*86)
-                        _url=${GHCUP_BASE_URL}/${ghver}/i386-linux-ghcup-${ghver}
-                        ;;
-                    armv7*|*armv8l*)
-                        _url=${GHCUP_BASE_URL}/${ghver}/armv7-linux-ghcup-${ghver}
-                        ;;
-                    aarch64|arm64)
-                        # we could be in a 32bit docker container, in which
-                        # case uname doesn't give us what we want
-                        if [ "$(getconf LONG_BIT)" = "32" ] ; then
-                            _url=${GHCUP_BASE_URL}/${ghver}/armv7-linux-ghcup-${ghver}
-                        elif [ "$(getconf LONG_BIT)" = "64" ] ; then
-                            _url=${GHCUP_BASE_URL}/${ghver}/aarch64-linux-ghcup-${ghver}
-                        else
-                            die "Unknown long bit size: $(getconf LONG_BIT)"
-                        fi
-                        ;;
-                    *) die "Unknown architecture: ${arch}"
-                        ;;
-                esac
-                ;;
-            "FreeBSD"|"freebsd")
-                if freebsd-version | grep -E '^12.*' ; then
-                    freebsd_ver=12
-                elif freebsd-version | grep -E '^13.*' ; then
-                    freebsd_ver=13
-                else
-                    die "Unsupported FreeBSD version! Please report a bug at https://gitlab.haskell.org/haskell/ghcup-hs/-/issues"
-                fi
 
-                case "${arch}" in
+    case "${plat}" in
-                    x86_64|amd64)
+        "linux"|"Linux")
-                        ;;
+			case "${arch}" in
-                    i*86)
+				x86_64|amd64)
-                        die "i386 currently not supported!"
+					# we could be in a 32bit docker container, in which
-                        ;;
+					# case uname doesn't give us what we want
-                    *) die "Unknown architecture: ${arch}"
+					if [ "$(getconf LONG_BIT)" = "32" ] ; then
-                        ;;
+						_url=${GHCUP_BASE_URL}/${ghver}/i386-linux-ghcup-${ghver}
-                esac
+					elif [ "$(getconf LONG_BIT)" = "64" ] ; then
-                _url=${GHCUP_BASE_URL}/${ghver}/x86_64-freebsd${freebsd_ver}-ghcup-${ghver}
+						_url=${GHCUP_BASE_URL}/${ghver}/x86_64-linux-ghcup-${ghver}
-                ;;
+					else
-            "Darwin"|"darwin")
+						die "Unknown long bit size: $(getconf LONG_BIT)"
-                case "${arch}" in
+					fi
-                    x86_64|amd64)
+					;;
-                        _url=${GHCUP_BASE_URL}/${ghver}/x86_64-apple-darwin-ghcup-${ghver}
+				i*86)
-                        ;;
+					_url=${GHCUP_BASE_URL}/${ghver}/i386-linux-ghcup-${ghver}
-                    aarch64|arm64|armv8l)
+					;;
-                        _url=${GHCUP_BASE_URL}/${ghver}/aarch64-apple-darwin-ghcup-${ghver}
+				armv7*|*armv8l*)
-                        ;;
+					_url=${GHCUP_BASE_URL}/${ghver}/armv7-linux-ghcup-${ghver}
-                    i*86)
+					;;
-                        die "i386 currently not supported!"
+				aarch64|arm64)
-                        ;;
+					# we could be in a 32bit docker container, in which
-                    *) die "Unknown architecture: ${arch}"
+					# case uname doesn't give us what we want
-                        ;;
+					if [ "$(getconf LONG_BIT)" = "32" ] ; then
-                esac
+						_url=${GHCUP_BASE_URL}/${ghver}/armv7-linux-ghcup-${ghver}
-                ;;
+					elif [ "$(getconf LONG_BIT)" = "64" ] ; then
-            MSYS*|MINGW*)
+						_url=${GHCUP_BASE_URL}/${ghver}/aarch64-linux-ghcup-${ghver}
-                case "${arch}" in
+					else
-                    x86_64|amd64)
+						die "Unknown long bit size: $(getconf LONG_BIT)"
-                        _url=${GHCUP_BASE_URL}/${ghver}/x86_64-mingw64-ghcup-${ghver}.exe
+					fi
-                        ;;
+					;;
-                    *) die "Unknown architecture: ${arch}"
+				*) die "Unknown architecture: ${arch}"
-                        ;;
+					;;
-                esac
+			esac
-                ;;
+			;;
-            *) die "Unknown platform: ${plat}"
+        "FreeBSD"|"freebsd")
-                ;;
+            if freebsd-version | grep -E '^12.*' ; then
-        esac
+                freebsd_ver=12
-        case "${plat}" in
+            elif freebsd-version | grep -E '^13.*' ; then
-            MSYS*|MINGW*)
+                freebsd_ver=13
-                edo curl -Lf "${_url}" > "${GHCUP_BIN}"/ghcup.exe
+            else
-                edo chmod +x "${GHCUP_BIN}"/ghcup.exe
+                die "Unsupported FreeBSD version! Please report a bug at https://gitlab.haskell.org/haskell/ghcup-hs/-/issues"
-                ;;
+            fi
-            *)
+
-                edo curl -Lf "${_url}" > "${GHCUP_BIN}"/ghcup
+			case "${arch}" in
-                edo chmod +x "${GHCUP_BIN}"/ghcup
+				x86_64|amd64)
-                ;;
+					;;
-        esac
+				i*86)
-    fi
+					die "i386 currently not supported!"
+					;;
+				*) die "Unknown architecture: ${arch}"
+					;;
+			esac
+			_url=${GHCUP_BASE_URL}/${ghver}/x86_64-freebsd${freebsd_ver}-ghcup-${ghver}
+            ;;
+        "Darwin"|"darwin")
+			case "${arch}" in
+				x86_64|amd64)
+					_url=${GHCUP_BASE_URL}/${ghver}/x86_64-apple-darwin-ghcup-${ghver}
+					;;
+				aarch64|arm64|armv8l)
+					_url=${GHCUP_BASE_URL}/${ghver}/aarch64-apple-darwin-ghcup-${ghver}
+					;;
+				i*86)
+					die "i386 currently not supported!"
+					;;
+				*) die "Unknown architecture: ${arch}"
+					;;
+			esac
+			;;
+        MSYS*|MINGW*)
+			case "${arch}" in
+				x86_64|amd64)
+					_url=${GHCUP_BASE_URL}/${ghver}/x86_64-mingw64-ghcup-${ghver}.exe
+					;;
+				*) die "Unknown architecture: ${arch}"
+					;;
+			esac
+			;;
+        *) die "Unknown platform: ${plat}"
+			;;
+    esac
+    case "${plat}" in
+        MSYS*|MINGW*)
+			edo curl -Lf "${_url}" > "${GHCUP_BIN}"/ghcup.exe
+			edo chmod +x "${GHCUP_BIN}"/ghcup.exe
+			;;
+		*)
+			edo curl -Lf "${_url}" > "${GHCUP_BIN}"/ghcup
+			edo chmod +x "${GHCUP_BIN}"/ghcup
+			;;
+	esac
 
 	edo mkdir -p "${GHCUP_DIR}"
 
@@ -345,9 +344,7 @@ download_ghcup() {
 
 	# shellcheck disable=SC1090
     edo . "${GHCUP_DIR}"/env
-    if [ -z "${BOOTSTRAP_HASKELL_NO_UPGRADE}" ] ; then
+    eghcup upgrade
-        ghcup upgrade || yellow "Failed to upgrade ghcup, continuing anyway"
-    fi
 }
 
 # Figures out the users login shell and sets
@@ -736,7 +733,13 @@ fi
 
 edo mkdir -p "${GHCUP_BIN}"
 
-download_ghcup
+if command -V "ghcup" >/dev/null 2>&1 ; then
+    if [ -z "${BOOTSTRAP_HASKELL_NO_UPGRADE}" ] ; then
+        _eghcup upgrade || download_ghcup
+    fi
+else
+	download_ghcup
+fi
 
 echo
 if [ -n "${BOOTSTRAP_HASKELL_YAML}" ] ; then (>&2 ghcup -s "${BOOTSTRAP_HASKELL_YAML}" tool-requirements) ; else (>&2 ghcup tool-requirements) ; fi