Make sure we source ghcup dirs in bootstrap script

Fixes #354
2022-04-29 16:19:53 +02:00
20 changed files with 351 additions and 429 deletions
--- a/.gitlab/script/ghcup_version.sh
+++ b/.gitlab/script/ghcup_version.sh
@@ -176,8 +176,6 @@ else
 	[ "$(ghc --numeric-version)" = "${ghc_ver}" ]


-	ls -lah "$GHCUP_BIN"
-
 	if [ "${OS}" = "DARWIN" ] ; then
 		eghcup install hls
 		$(eghcup whereis hls) --version
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,12 +1,5 @@
 # Revision history for ghcup

-## 0.1.17.8 -- XXXX-XX-XX
-
-* Fix HLS build not cleaning up properly on failed installations, fixes [#361](https://gitlab.haskell.org/haskell/ghcup-hs/-/issues/361)
-    - this also fixes a significant bug on installation failure when combining `--isolate DIR` with `--force`
-* Fix parsing of symlinks with multiple slashes, wrt [#353](https://gitlab.haskell.org/haskell/ghcup-hs/-/issues/353)
-* Re-enable upgrade functionality for all configurations wrt [#250](https://gitlab.haskell.org/haskell/ghcup-hs/-/merge_requests/250)
-
 ## 0.1.17.7 -- 2022-04-21

 * Fix `ghcup run` on windows wrt [#345](https://gitlab.haskell.org/haskell/ghcup-hs/-/issues/345)
--- a/app/ghcup/BrickMain.hs
+++ b/app/ghcup/BrickMain.hs
@@ -437,7 +437,6 @@ install' _ (_, ListResult {..}) = do
              , TarDirDoesNotExist
              , FileAlreadyExistsError
              , ProcessError
-              , GHCupShadowed
              ]

  run (do
@@ -447,19 +446,19 @@ install' _ (_, ListResult {..}) = do
      case lTool of
        GHC   -> do
          let vi = getVersionInfo lVer GHC dls
-          liftE $ installGHCBin lVer GHCupInternal False $> (vi, dirs, ce)
+          liftE $ installGHCBin lVer Nothing False $> (vi, dirs, ce)
        Cabal -> do
          let vi = getVersionInfo lVer Cabal dls
-          liftE $ installCabalBin lVer GHCupInternal False $> (vi, dirs, ce)
+          liftE $ installCabalBin lVer Nothing False $> (vi, dirs, ce)
        GHCup -> do
          let vi = snd <$> getLatest dls GHCup
-          liftE $ upgradeGHCup Nothing False False $> (vi, dirs, ce)
+          liftE $ upgradeGHCup Nothing False $> (vi, dirs, ce)
        HLS   -> do
          let vi = getVersionInfo lVer HLS dls
-          liftE $ installHLSBin lVer GHCupInternal False $> (vi, dirs, ce)
+          liftE $ installHLSBin lVer Nothing False $> (vi, dirs, ce)
        Stack -> do
          let vi = getVersionInfo lVer Stack dls
-          liftE $ installStackBin lVer GHCupInternal False $> (vi, dirs, ce)
+          liftE $ installStackBin lVer Nothing False $> (vi, dirs, ce)
    )
    >>= \case
          VRight (vi, Dirs{..}, Just ce) -> do
--- a/app/ghcup/GHCup/OptParse.hs
+++ b/app/ghcup/GHCup/OptParse.hs
@@ -96,7 +96,7 @@ data Command
  | Config ConfigCommand
  | Whereis WhereisOptions WhereisCommand
 #ifndef DISABLE_UPGRADE
-  | Upgrade UpgradeOpts Bool Bool
+  | Upgrade UpgradeOpts Bool
 #endif
  | ToolRequirements ToolReqOpts
  | ChangeLog ChangeLogOptions
@@ -222,18 +222,18 @@ com =
           (info (List <$> listOpts <**> helper)
                 (progDesc "Show available GHCs and other tools")
           )
+#ifndef DISABLE_UPGRADE
      <> command
           "upgrade"
           (info
             (    (Upgrade <$> upgradeOptsP <*> switch
                    (short 'f' <> long "force" <> help "Force update")
-                    <*> switch
-                    (long "fail-if-shadowed" <> help "Fails after upgrading if the upgraded ghcup binary is shadowed by something else in PATH (useful for CI)")
                  )
             <**> helper
             )
             (progDesc "Upgrade ghcup")
           )
+#endif
      <> command
           "compile"
           (   Compile
--- a/app/ghcup/GHCup/OptParse/Compile.hs
+++ b/app/ghcup/GHCup/OptParse/Compile.hs
@@ -283,7 +283,7 @@ hlsCompileOpts =
          (short 'g' <> long "git-ref" <> metavar "GIT_REFERENCE" <> help
            "The git commit/branch/ref to build from"
          ) <*>
-          optional (option str (short 'r' <> long "repository" <> metavar "GIT_REPOSITORY" <> help "The git repository to build from (defaults to HLS upstream)"
+          optional (option str (short 'r' <> long "repository" <> metavar "GIT_REPOSITORY" <> help "The git repository to build from (defaults to GHC upstream)"
            <> completer (gitFileUri ["https://github.com/haskell/haskell-language-server.git"])
          ))
          )))
@@ -469,7 +469,7 @@ compile compileCommand settings Dirs{..} runAppState runLogger = do
                    ghcs
                    jobs
                    ovewrwiteVer
-                    (maybe GHCupInternal IsolateDir isolateDir)
+                    isolateDir
                    cabalProject
                    cabalProjectLocal
                    patches
@@ -524,7 +524,7 @@ compile compileCommand settings Dirs{..} runAppState runLogger = do
                    addConfArgs
                    buildFlavour
                    hadrian
-                    (maybe GHCupInternal IsolateDir isolateDir)
+                    isolateDir
        GHCupInfo { _ghcupDownloads = dls } <- lift getGHCupInfo
        let vi = getVersionInfo (_tvVersion targetVer) GHC dls
        when setCompile $ void $ liftE $
--- a/app/ghcup/GHCup/OptParse/Install.hs
+++ b/app/ghcup/GHCup/OptParse/Install.hs
@@ -216,7 +216,7 @@ installOpts tool =
    Nothing  -> False
    Just GHC -> False
    Just _   -> True
-
+          



@@ -395,7 +395,7 @@ install installCommand settings getAppState' runLogger = case installCommand of
         (v, vi) <- liftE $ fromVersion instVer GHC
         void $ liftE $ sequenceE (installGHCBin
                     (_tvVersion v)
-                     (maybe GHCupInternal IsolateDir isolateDir)
+                     isolateDir
                     forceInstall
                   )
                   $ when instSet $ when (isNothing isolateDir) $ void $ setGHC v SetGHCOnly Nothing
@@ -406,7 +406,7 @@ install installCommand settings getAppState' runLogger = case installCommand of
           void $ liftE $ sequenceE (installGHCBindist
                       (DownloadInfo uri (Just $ RegexDir "ghc-.*") "")
                       (_tvVersion v)
-                       (maybe GHCupInternal IsolateDir isolateDir)
+                       isolateDir
                       forceInstall
                     )
                     $ when instSet $ when (isNothing isolateDir) $ void $ setGHC v SetGHCOnly Nothing
@@ -467,7 +467,7 @@ install installCommand settings getAppState' runLogger = case installCommand of
         (_tvVersion -> v, vi) <- liftE $ fromVersion instVer Cabal
         void $ liftE $ sequenceE (installCabalBin
                                    v
-                                    (maybe GHCupInternal IsolateDir isolateDir)
+                                    isolateDir
                                    forceInstall
                                  ) $ when instSet $ when (isNothing isolateDir) $ void $ setCabal v
         pure vi
@@ -477,7 +477,7 @@ install installCommand settings getAppState' runLogger = case installCommand of
           void $ liftE $ sequenceE (installCabalBindist
                                      (DownloadInfo uri Nothing "")
                                      v
-                                      (maybe GHCupInternal IsolateDir isolateDir)
+                                      isolateDir
                                      forceInstall
                                    ) $ when instSet $ when (isNothing isolateDir) $ void $ setCabal v
           pure vi
@@ -518,7 +518,7 @@ install installCommand settings getAppState' runLogger = case installCommand of
         (_tvVersion -> v, vi) <- liftE $ fromVersion instVer HLS
         void $ liftE $ sequenceE (installHLSBin
                                    v
-                                    (maybe GHCupInternal IsolateDir isolateDir)
+                                    isolateDir
                                    forceInstall
                                  ) $ when instSet $ when (isNothing isolateDir) $ void $ setHLS v SetHLSOnly Nothing
         pure vi
@@ -529,7 +529,7 @@ install installCommand settings getAppState' runLogger = case installCommand of
           void $ liftE $ sequenceE (installHLSBindist
                                      (DownloadInfo uri (Just $ RegexDir "haskell-language-server-*") "")
                                      v
-                                      (maybe GHCupInternal IsolateDir isolateDir)
+                                      isolateDir
                                      forceInstall
                                    ) $ when instSet $ when (isNothing isolateDir) $ void $ setHLS v SetHLSOnly Nothing
           pure vi
@@ -578,7 +578,7 @@ install installCommand settings getAppState' runLogger = case installCommand of
          (_tvVersion -> v, vi) <- liftE $ fromVersion instVer Stack
          void $ liftE $ sequenceE (installStackBin
                                     v
-                                     (maybe GHCupInternal IsolateDir isolateDir)
+                                     isolateDir
                                     forceInstall
                                   ) $ when instSet $ when (isNothing isolateDir) $ void $ setStack v
          pure vi
@@ -588,7 +588,7 @@ install installCommand settings getAppState' runLogger = case installCommand of
            void $ liftE $ sequenceE (installStackBindist
                                       (DownloadInfo uri Nothing "")
                                       v
-                                       (maybe GHCupInternal IsolateDir isolateDir)
+                                       isolateDir
                                       forceInstall
                                     ) $ when instSet $ when (isNothing isolateDir) $ void $ setStack v
            pure vi
--- a/app/ghcup/GHCup/OptParse/Run.hs
+++ b/app/ghcup/GHCup/OptParse/Run.hs
@@ -61,7 +61,6 @@ data RunOptions = RunOptions
  , runHLSVer     :: Maybe ToolVersion
  , runStackVer   :: Maybe ToolVersion
  , runBinDir     :: Maybe FilePath
-  , runQuick      :: Bool
  , runCOMMAND    :: [String]
  }

@@ -71,8 +70,8 @@ data RunOptions = RunOptions
    --[ Parsers ]--
    ---------------

-
-
+          
+    
 runOpts :: Parser RunOptions
 runOpts =
  RunOptions
@@ -122,8 +121,6 @@ runOpts =
           <> completer (bashCompleter "directory")
           )
          )
-    <*> switch
-          (short 'q' <> long "quick" <> help "Avoid any expensive work (such as downloads, version/tag resolution etc.). Disables --install.")
    <*> many (argument str (metavar "COMMAND" <> help "The command to run, with arguments (use longopts --). If omitted, just prints the created bin/ dir to stdout and exits."))
          

@@ -222,15 +219,29 @@ run :: forall m.
   -> (ReaderT LeanAppState m () -> m ())
   -> m ExitCode
 run RunOptions{..} runAppState leanAppstate runLogger = do
-   r <- if not runQuick
+   r <- if or (fmap (maybe False isToolTag) [runGHCVer, runCabalVer, runHLSVer, runStackVer]) || runInstTool'
        then runRUN runAppState $ do
         toolchain <- liftE resolveToolchainFull
-         tmp <- liftIO $ createTmpDir toolchain
+         tmp <- case runBinDir of
+           Just bindir -> do
+             liftIO $ createDirRecursive' bindir
+             liftIO $ canonicalizePath bindir
+           Nothing -> do
+             d <- liftIO $ predictableTmpDir toolchain
+             liftIO $ createDirRecursive' d
+             liftIO $ canonicalizePath d
         liftE $ installToolChainFull toolchain tmp
         pure tmp
        else runLeanRUN leanAppstate $ do
         toolchain <- resolveToolchain
-         tmp <- liftIO $ createTmpDir toolchain
+         tmp <- case runBinDir of
+           Just bindir -> do
+             liftIO $ createDirRecursive' bindir
+             liftIO $ canonicalizePath bindir
+           Nothing -> do
+             d <- liftIO $ predictableTmpDir toolchain
+             liftIO $ createDirRecursive' d
+             liftIO $ canonicalizePath d
         liftE $ installToolChain toolchain tmp
         pure tmp
   case r of
@@ -258,16 +269,9 @@ run RunOptions{..} runAppState leanAppstate runLogger = do

  where

-   createTmpDir :: Toolchain -> IO FilePath
-   createTmpDir toolchain =
-     case runBinDir of
-           Just bindir -> do
-             createDirRecursive' bindir
-             canonicalizePath bindir
-           Nothing -> do
-             d <- predictableTmpDir toolchain
-             createDirRecursive' d
-             canonicalizePath d
+   isToolTag :: ToolVersion -> Bool
+   isToolTag (ToolTag _) = True
+   isToolTag _           = False

   -- TODO: doesn't work for cross
   resolveToolchainFull :: ( MonadFail m
@@ -347,25 +351,25 @@ run RunOptions{..} runAppState leanAppstate runLogger = do
             Just (GHC, v) -> do
               unless isInstalled $ when (runInstTool' && isNothing (_tvTarget v)) $ void $ liftE $ installGHCBin
                 (_tvVersion v)
-                 GHCupInternal
+                 Nothing
                 False
               setTool GHC v tmp
             Just (Cabal, v) -> do
               unless isInstalled $ when runInstTool' $ void $ liftE $ installCabalBin
                 (_tvVersion v)
-                 GHCupInternal
+                 Nothing
                 False
               setTool Cabal v tmp
             Just (Stack, v) -> do
               unless isInstalled $ when runInstTool' $ void $ liftE $ installStackBin
                 (_tvVersion v)
-                 GHCupInternal
+                 Nothing
                 False
               setTool Stack v tmp
             Just (HLS, v) -> do
               unless isInstalled $ when runInstTool' $ void $ liftE $ installHLSBin
                 (_tvVersion v)
-                 GHCupInternal
+                 Nothing
                 False
               setTool HLS v tmp
             _ -> pure ()
--- a/app/ghcup/GHCup/OptParse/Upgrade.hs
+++ b/app/ghcup/GHCup/OptParse/Upgrade.hs
@@ -59,16 +59,15 @@ data UpgradeOpts = UpgradeInplace
    --[ Parsers ]--
    ---------------

-
+          
 upgradeOptsP :: Parser UpgradeOpts
 upgradeOptsP =
  flag'
      UpgradeInplace
      (short 'i' <> long "inplace" <> help
-        "Upgrade ghcup in-place"
+        "Upgrade ghcup in-place (wherever it's at)"
      )
-    <|>
-      (   UpgradeAt
+    <|> (   UpgradeAt
        <$> option
              str
              (short 't' <> long "target" <> metavar "TARGET_DIR" <> help
@@ -93,7 +92,6 @@ type UpgradeEffects = '[ DigestError
                       , FileDoesNotExistError
                       , CopyError
                       , DownloadFailed
-                       , GHCupShadowed
                       ]


@@ -122,19 +120,18 @@ upgrade :: ( Monad m
           )
        => UpgradeOpts
        -> Bool
-        -> Bool
        -> Dirs
        -> (forall a. ReaderT AppState m (VEither UpgradeEffects a) -> m (VEither UpgradeEffects a))
        -> (ReaderT LeanAppState m () -> m ())
        -> m ExitCode
-upgrade uOpts force' fatal Dirs{..} runAppState runLogger = do
+upgrade uOpts force' Dirs{..} runAppState runLogger = do
  target <- case uOpts of
    UpgradeInplace  -> Just <$> liftIO getExecutablePath
    (UpgradeAt p)   -> pure $ Just p
    UpgradeGHCupDir -> pure (Just (binDir </> "ghcup" <> exeExt))

  runUpgrade runAppState (do
-    v' <- liftE $ upgradeGHCup target force' fatal
+    v' <- liftE $ upgradeGHCup target force'
    GHCupInfo { _ghcupDownloads = dls } <- lift getGHCupInfo
    pure (v', dls)
    ) >>= \case
--- a/app/ghcup/Main.hs
+++ b/app/ghcup/Main.hs
@@ -141,7 +141,9 @@ main = do
        )
  let listCommands = infoOption
        ("install set rm install-cabal list"
+#ifndef DISABLE_UPGRADE
          <> " upgrade"
+#endif
          <> " compile debug-info tool-requirements changelog"
        )
        (  long "list-commands"
@@ -243,10 +245,14 @@ Report bugs at <https://gitlab.haskell.org/haskell/ghcup-hs/issues>|]
                             alreadyInstalling' <- alreadyInstalling optCommand newTool
                             when (not alreadyInstalling') $
                               case t of
+#ifdef DISABLE_UPGRADE
+                                 GHCup -> pure ()
+#else
                                 GHCup -> runLogger $
                                            logWarn ("New GHCup version available: "
                                              <> prettyVer l
                                              <> ". To upgrade, run 'ghcup upgrade'")
+#endif
                                 _ -> runLogger $
                                        logWarn ("New "
                                          <> T.pack (prettyShow t)
@@ -290,24 +296,26 @@ Report bugs at <https://gitlab.haskell.org/haskell/ghcup-hs/issues>|]
              s' <- appState
              liftIO $ brickMain s' >> pure ExitSuccess
 #endif
-            Install installCommand     -> install installCommand settings appState runLogger
-            InstallCabalLegacy iopts   -> install (Left (InstallCabal iopts)) settings appState runLogger
-            Set setCommand             -> set setCommand runAppState runLeanAppState runLogger
-            UnSet unsetCommand         -> unset unsetCommand runLeanAppState runLogger
-            List lo                    -> list lo no_color runAppState
-            Rm rmCommand               -> rm rmCommand runAppState runLogger
-            DInfo                      -> dinfo runAppState runLogger
-            Compile compileCommand     -> compile compileCommand settings dirs runAppState runLogger
-            Config configCommand       -> config configCommand settings keybindings runLogger
+            Install installCommand   -> install installCommand settings appState runLogger
+            InstallCabalLegacy iopts -> install (Left (InstallCabal iopts)) settings appState runLogger
+            Set setCommand           -> set setCommand runAppState runLeanAppState runLogger
+            UnSet unsetCommand       -> unset unsetCommand runLeanAppState runLogger
+            List lo                  -> list lo no_color runAppState
+            Rm rmCommand             -> rm rmCommand runAppState runLogger
+            DInfo                    -> dinfo runAppState runLogger
+            Compile compileCommand   -> compile compileCommand settings dirs runAppState runLogger
+            Config configCommand     -> config configCommand settings keybindings runLogger
            Whereis whereisOptions
-                    whereisCommand     -> whereis whereisCommand whereisOptions runAppState leanAppstate runLogger
-            Upgrade uOpts force' fatal -> upgrade uOpts force' fatal dirs runAppState runLogger
-            ToolRequirements topts     -> toolRequirements topts runAppState runLogger
-            ChangeLog changelogOpts    -> changelog changelogOpts runAppState runLogger
-            Nuke                       -> nuke appState runLogger
-            Prefetch pfCom             -> prefetch pfCom runAppState runLogger
-            GC gcOpts                  -> gc gcOpts runAppState runLogger
-            Run runCommand             -> run runCommand appState leanAppstate runLogger
+                    whereisCommand   -> whereis whereisCommand whereisOptions runAppState leanAppstate runLogger
+#ifndef DISABLE_UPGRADE
+            Upgrade uOpts force'     -> upgrade uOpts force' dirs runAppState runLogger
+#endif
+            ToolRequirements topts   -> toolRequirements topts runAppState runLogger
+            ChangeLog changelogOpts  -> changelog changelogOpts runAppState runLogger
+            Nuke                     -> nuke appState runLogger
+            Prefetch pfCom           -> prefetch pfCom runAppState runLogger
+            GC gcOpts                -> gc gcOpts runAppState runLogger
+            Run runCommand           -> run runCommand appState leanAppstate runLogger

          case res of
            ExitSuccess        -> pure ()
@@ -345,7 +353,9 @@ Report bugs at <https://gitlab.haskell.org/haskell/ghcup-hs/issues>|]
    (HLS, ver)   = cmp' HLS (Just $ ToolVersion (mkTVer over)) ver
  alreadyInstalling (Compile (CompileHLS HLSCompileOptions{ targetHLS = Left tver }))
    (HLS, ver)   = cmp' HLS (Just $ ToolVersion (mkTVer tver)) ver
-  alreadyInstalling (Upgrade _ _ _) (GHCup, _) = pure True
+#ifndef DISABLE_UPGRADE
+  alreadyInstalling (Upgrade _ _) (GHCup, _) = pure True
+#endif
  alreadyInstalling _ _ = pure False

  cmp' :: ( HasLog env
--- a/docs/guide.md
+++ b/docs/guide.md
@@ -57,13 +57,6 @@ as e.g. `/etc/bash_completion.d/ghcup` (depending on distro)
 and make sure your bashrc sources the startup script
 (`/usr/share/bash-completion/bash_completion` on some distros).

-## Portability
-
-`ghcup` is very portable. There are a few exceptions though:
-
-1. `ghcup tui` is only available on non-windows platforms
-2. legacy subcommands `ghcup install` (without a tool identifier) and `ghcup install-cabal` may be removed in the future
-
 # Configuration

 A configuration file can be put in `~/.ghcup/config.yaml`. The default config file
--- a/docs/install.md
+++ b/docs/install.md
@@ -105,8 +105,7 @@ GHCup supports the following tools, which are also known as the **Haskell Toolch
 <table>
 <thead><tr><th>HLS Version</th><th>Tags</th></tr></thead>
 <tbody>
-<tr><td>1.7.0.0</td><td><span style="color:blue">latest</span>, <span style="color:green">recommended</span></td></tr>
-<tr><td>1.6.1.0</td><td></td></tr>
+<tr><td>1.6.1.0</td><td><span style="color:blue">latest</span>, <span style="color:green">recommended</span></td></tr>
 <tr><td>1.6.0.0</td><td></td></tr>
 <tr><td>1.5.1</td><td></td></tr>
 <tr><td>1.5.0</td><td></td></tr>
--- a/docs/steps.md
+++ b/docs/steps.md
@@ -16,8 +16,6 @@ The Glorious Glasgow Haskell Compilation System, version 8.10.7
 If this fails, consult [the Getting started page](../install) for information on
 how to install Haskell on your computer.

-This guide is partly based on [Gil Mizrahi's blog](https://gilmi.me/blog/post/2021/08/14/hs-core-tools).
-
 ## Compiling programs with ghc

 Running `ghc` invokes the Glasgow Haskell Compiler (GHC), and can be used to
@@ -328,7 +326,6 @@ see the [Cabal user guide](https://cabal.readthedocs.io/en/stable/getting-starte
 <a href="https://hackage.haskell.org/" class="btn btn-primary" role="button">Discover Haskell packages</a>
 <a href="https://hackage.haskell.org/package/base" class="btn btn-primary" role="button">The standard library</a>
 <a href="https://haskell-language-server.readthedocs.io/en/stable/installation.html" class="btn btn-primary" role="button">Editor setup with HLS</a>
-<a href="https://play-haskell.tomsmeding.com/play" class="btn btn-primary" role="button">Online playground</a>
 </div>

 ## How to learn Haskell proper
--- a/ghcup.cabal
+++ b/ghcup.cabal
@@ -1,6 +1,6 @@
 cabal-version:      3.0
 name:               ghcup
-version:            0.1.17.8
+version:            0.1.17.7
 license:            LGPL-3.0-only
 license-file:       LICENSE
 copyright:          Julian Ospald 2020
@@ -48,6 +48,13 @@ flag no-exe
  default:     False
  manual:      True

+flag disable-upgrade
+  description:
+    Disable upgrade functionality. This is mainly to support brew packagers.
+
+  default:     False
+  manual:      True
+
 library
  exposed-modules:
    GHCup
@@ -197,7 +204,6 @@ executable ghcup
    GHCup.OptParse.Set
    GHCup.OptParse.ToolRequirements
    GHCup.OptParse.UnSet
-    GHCup.OptParse.Upgrade
    GHCup.OptParse.Whereis

  hs-source-dirs:     app/ghcup
@@ -271,6 +277,11 @@ executable ghcup
  if flag(no-exe)
    buildable: False

+  if flag(disable-upgrade)
+    cpp-options: -DDISABLE_UPGRADE
+
+  else
+    other-modules: GHCup.OptParse.Upgrade

 test-suite ghcup-test
  type:               exitcode-stdio-1.0
--- a/lib/GHCup.hs
+++ b/lib/GHCup.hs
@@ -187,7 +187,7 @@ installGHCBindist :: ( MonadFail m
                     )
                  => DownloadInfo    -- ^ where/how to download
                  -> Version         -- ^ the version to install
-                  -> InstallDir
+                  -> Maybe FilePath  -- ^ isolated filepath if user passed any
                  -> Bool            -- ^ Force install
                  -> Excepts
                       '[ AlreadyInstalled
@@ -205,22 +205,22 @@ installGHCBindist :: ( MonadFail m
                        ]
                       m
                       ()
-installGHCBindist dlinfo ver installDir forceInstall = do
+installGHCBindist dlinfo ver isoFilepath forceInstall = do
  let tver = mkTVer ver

  lift $ logDebug $ "Requested to install GHC with " <> prettyVer ver

  regularGHCInstalled <- lift $ checkIfToolInstalled GHC ver
-
+  
  if
    | not forceInstall
    , regularGHCInstalled
-    , GHCupInternal <- installDir -> do
+    , Nothing <- isoFilepath -> do
        throwE $ AlreadyInstalled GHC ver

    | forceInstall
    , regularGHCInstalled
-    , GHCupInternal <- installDir -> do
+    , Nothing <- isoFilepath -> do
        lift $ logInfo "Removing the currently installed GHC version first!"
        liftE $ rmGHCVer tver

@@ -229,18 +229,17 @@ installGHCBindist dlinfo ver installDir forceInstall = do
  -- download (or use cached version)
  dl <- liftE $ downloadCached dlinfo Nothing

+  -- prepare paths
+  ghcdir <- lift $ ghcupGHCDir tver

  toolchainSanityChecks

-  case installDir of
-    IsolateDir isoDir -> do                        -- isolated install
+  case isoFilepath of
+    Just isoDir -> do                        -- isolated install
      lift $ logInfo $ "isolated installing GHC to " <> T.pack isoDir
-      liftE $ installPackedGHC dl (view dlSubdir dlinfo) (IsolateDirResolved isoDir) ver forceInstall
-    GHCupInternal -> do                            -- regular install
-      -- prepare paths
-      ghcdir <- lift $ ghcupGHCDir tver
-
-      liftE $ installPackedGHC dl (view dlSubdir dlinfo) (GHCupDir ghcdir) ver forceInstall
+      liftE $ installPackedGHC dl (view dlSubdir dlinfo) isoDir ver forceInstall
+    Nothing -> do                            -- regular install
+      liftE $ installPackedGHC dl (view dlSubdir dlinfo) ghcdir ver forceInstall

      -- make symlinks & stuff when regular install,
      liftE $ postGHCInstall tver
@@ -272,7 +271,7 @@ installPackedGHC :: ( MonadMask m
                    )
                 => FilePath          -- ^ Path to the packed GHC bindist
                 -> Maybe TarDir      -- ^ Subdir of the archive
-                 -> InstallDirResolved
+                 -> FilePath          -- ^ Path to install to
                 -> Version           -- ^ The GHC version
                 -> Bool              -- ^ Force install
                 -> Excepts
@@ -298,13 +297,9 @@ installPackedGHC dl msubdir inst ver forceInstall = do
  workdir <- maybe (pure tmpUnpack)
                   (liftE . intoSubdir tmpUnpack)
                   msubdir
-
+  
  liftE $ runBuildAction tmpUnpack
-                         (case inst of
-                           IsolateDirResolved _ -> Nothing -- don't clean up for isolated installs, since that'd potentially delete other
-                                                   -- user files if '--force' is supplied
-                           GHCupDir d -> Just d
-                           )
+                         (Just inst)
                         (installUnpackedGHC workdir inst ver)


@@ -320,11 +315,11 @@ installUnpackedGHC :: ( MonadReader env m
                      , MonadUnliftIO m
                      , MonadMask m
                      )
-                   => FilePath            -- ^ Path to the unpacked GHC bindist (where the configure script resides)
-                   -> InstallDirResolved  -- ^ Path to install to
-                   -> Version             -- ^ The GHC version
+                   => FilePath      -- ^ Path to the unpacked GHC bindist (where the configure script resides)
+                   -> FilePath      -- ^ Path to install to
+                   -> Version       -- ^ The GHC version
                   -> Excepts '[ProcessError] m ()
-installUnpackedGHC path (fromInstallDir -> inst) ver
+installUnpackedGHC path inst ver
  | isWindows = do
      lift $ logInfo "Installing GHC (this may take a while)"
      -- Windows bindists are relocatable and don't need
@@ -345,7 +340,7 @@ installUnpackedGHC path (fromInstallDir -> inst) ver

      lift $ logInfo "Installing GHC (this may take a while)"
      lEM $ execLogged "sh"
-                       ("./configure" : ("--prefix=" <> inst)
+                       ("./configure" : ("--prefix=" <> inst) 
                        : alpineArgs
                       )
                       (Just path)
@@ -374,7 +369,7 @@ installGHCBin :: ( MonadFail m
                 , MonadUnliftIO m
                 )
              => Version         -- ^ the version to install
-              -> InstallDir
+              -> Maybe FilePath  -- ^ isolated install filepath, if user passed any
              -> Bool            -- ^ force install
              -> Excepts
                   '[ AlreadyInstalled
@@ -392,9 +387,9 @@ installGHCBin :: ( MonadFail m
                    ]
                   m
                   ()
-installGHCBin ver installDir forceInstall = do
+installGHCBin ver isoFilepath forceInstall = do
  dlinfo <- liftE $ getDownloadInfo GHC ver
-  liftE $ installGHCBindist dlinfo ver installDir forceInstall
+  liftE $ installGHCBindist dlinfo ver isoFilepath forceInstall


 -- | Like 'installCabalBin', except takes the 'DownloadInfo' as
@@ -413,8 +408,8 @@ installCabalBindist :: ( MonadMask m
                       )
                    => DownloadInfo
                    -> Version
-                    -> InstallDir
-                    -> Bool           -- ^ Force install
+                    -> Maybe FilePath -- ^ isolated install filepath, if user provides any.
+                    -> Bool           -- ^ Force install 
                    -> Excepts
                         '[ AlreadyInstalled
                          , CopyError
@@ -430,7 +425,7 @@ installCabalBindist :: ( MonadMask m
                          ]
                         m
                         ()
-installCabalBindist dlinfo ver installDir forceInstall = do
+installCabalBindist dlinfo ver isoFilepath forceInstall = do
  lift $ logDebug $ "Requested to install cabal version " <> prettyVer ver

  PlatformRequest {..} <- lift getPlatformReq
@@ -442,18 +437,18 @@ installCabalBindist dlinfo ver installDir forceInstall = do
  if
    | not forceInstall
    , regularCabalInstalled
-    , GHCupInternal <- installDir -> do
+    ,  Nothing <- isoFilepath -> do
        throwE $ AlreadyInstalled Cabal ver
-
+        
    | forceInstall
    , regularCabalInstalled
-    , GHCupInternal <- installDir -> do
+    , Nothing <- isoFilepath -> do
        lift $ logInfo "Removing the currently installed version first!"
        liftE $ rmCabalVer ver

    | otherwise -> pure ()

-
+               
  -- download (or use cached version)
  dl <- liftE $ downloadCached dlinfo Nothing

@@ -465,37 +460,34 @@ installCabalBindist dlinfo ver installDir forceInstall = do
  -- the subdir of the archive where we do the work
  workdir <- maybe (pure tmpUnpack) (liftE . intoSubdir tmpUnpack) (view dlSubdir dlinfo)

-  case installDir of
-    IsolateDir isoDir -> do             -- isolated install
+  case isoFilepath of
+    Just isoDir -> do             -- isolated install
      lift $ logInfo $ "isolated installing Cabal to " <> T.pack isoDir
-      liftE $ installCabalUnpacked workdir (IsolateDirResolved isoDir) ver forceInstall
-
-    GHCupInternal -> do                 -- regular install
-      liftE $ installCabalUnpacked workdir (GHCupDir binDir) ver forceInstall
+      liftE $ installCabalUnpacked workdir isoDir Nothing forceInstall

+    Nothing -> do                 -- regular install
+      liftE $ installCabalUnpacked workdir binDir (Just ver) forceInstall

+      
 -- | Install an unpacked cabal distribution.Symbol
 installCabalUnpacked :: (MonadCatch m, HasLog env, MonadIO m, MonadReader env m)
              => FilePath      -- ^ Path to the unpacked cabal bindist (where the executable resides)
-              -> InstallDirResolved      -- ^ Path to install to
-              -> Version
+              -> FilePath      -- ^ Path to install to
+              -> Maybe Version -- ^ Nothing for isolated install
              -> Bool          -- ^ Force Install
              -> Excepts '[CopyError, FileAlreadyExistsError] m ()
-installCabalUnpacked path inst ver forceInstall = do
+installCabalUnpacked path inst mver' forceInstall = do
  lift $ logInfo "Installing cabal"
  let cabalFile = "cabal"
-  liftIO $ createDirRecursive' (fromInstallDir inst)
+  liftIO $ createDirRecursive' inst
  let destFileName = cabalFile
-        <> (case inst of
-              IsolateDirResolved _ -> ""
-              GHCupDir _ -> ("-" <>) . T.unpack . prettyVer $ ver
-           )
+        <> maybe "" (("-" <>) . T.unpack . prettyVer) mver'
        <> exeExt
-  let destPath = fromInstallDir inst </> destFileName
+  let destPath = inst </> destFileName

  unless forceInstall          -- Overwrite it when it IS a force install
    (liftE $ throwIfFileAlreadyExists destPath)
-
+    
  copyFileE
    (path </> cabalFile <> exeExt)
    destPath
@@ -518,7 +510,7 @@ installCabalBin :: ( MonadMask m
                   , MonadFail m
                   )
                => Version
-                -> InstallDir
+                -> Maybe FilePath -- isolated install Path, if user provided any
                -> Bool           -- force install
                -> Excepts
                     '[ AlreadyInstalled
@@ -535,9 +527,9 @@ installCabalBin :: ( MonadMask m
                      ]
                     m
                     ()
-installCabalBin ver installDir forceInstall = do
+installCabalBin ver isoFilepath forceInstall = do
  dlinfo <- liftE $ getDownloadInfo Cabal ver
-  installCabalBindist dlinfo ver installDir forceInstall
+  installCabalBindist dlinfo ver isoFilepath forceInstall


 -- | Like 'installHLSBin, except takes the 'DownloadInfo' as
@@ -556,8 +548,8 @@ installHLSBindist :: ( MonadMask m
                     )
                  => DownloadInfo
                  -> Version
-                  -> InstallDir -- ^ isolated install path, if user passed any
-                  -> Bool       -- ^ Force install
+                  -> Maybe FilePath -- ^ isolated install path, if user passed any
+                  -> Bool           -- ^ Force install
                  -> Excepts
                       '[ AlreadyInstalled
                        , CopyError
@@ -575,7 +567,7 @@ installHLSBindist :: ( MonadMask m
                        ]
                       m
                       ()
-installHLSBindist dlinfo ver installDir forceInstall = do
+installHLSBindist dlinfo ver isoFilepath forceInstall = do
  lift $ logDebug $ "Requested to install hls version " <> prettyVer ver

  PlatformRequest {..} <- lift getPlatformReq
@@ -586,17 +578,17 @@ installHLSBindist dlinfo ver installDir forceInstall = do
  if
    | not forceInstall
    , regularHLSInstalled
-    , GHCupInternal <- installDir -> do        -- regular install
+    , Nothing <- isoFilepath -> do      -- regular install
        throwE $ AlreadyInstalled HLS ver

    | forceInstall
    , regularHLSInstalled
-    , GHCupInternal <- installDir -> do        -- regular forced install
+    , Nothing <- isoFilepath -> do      -- regular forced install
        lift $ logInfo "Removing the currently installed version of HLS before force installing!"
        liftE $ rmHLSVer ver

    | otherwise -> pure ()
-
+    
  -- download (or use cached version)
  dl <- liftE $ downloadCached dlinfo Nothing

@@ -612,23 +604,22 @@ installHLSBindist dlinfo ver installDir forceInstall = do
  if
    | not forceInstall
    , not legacy
-    , (IsolateDir fp) <- installDir -> liftE $ installDestSanityCheck (IsolateDirResolved fp)
+    , (Just fp) <- isoFilepath -> liftE $ installDestSanityCheck fp
    | otherwise -> pure ()

-  case installDir of
-    IsolateDir isoDir -> do
+  case isoFilepath of
+    Just isoDir -> do
      lift $ logInfo $ "isolated installing HLS to " <> T.pack isoDir
      if legacy
-      then liftE $ installHLSUnpackedLegacy workdir (IsolateDirResolved isoDir) ver forceInstall
-      else liftE $ runBuildAction tmpUnpack Nothing $ installHLSUnpacked workdir (IsolateDirResolved isoDir) ver
+      then liftE $ installHLSUnpackedLegacy workdir isoDir Nothing forceInstall
+      else liftE $ runBuildAction tmpUnpack Nothing $ installHLSUnpacked workdir isoDir ver

-    GHCupInternal -> do
+    Nothing -> do
      if legacy
-      then liftE $ installHLSUnpackedLegacy workdir (GHCupDir binDir) ver forceInstall
+      then liftE $ installHLSUnpackedLegacy workdir binDir (Just ver) forceInstall
      else do
        inst <- ghcupHLSDir ver
-        liftE $ runBuildAction tmpUnpack (Just inst)
-              $ installHLSUnpacked workdir (GHCupDir inst) ver
+        liftE $ runBuildAction tmpUnpack Nothing $ installHLSUnpacked workdir inst ver
        liftE $ setHLS ver SetHLS_XYZ Nothing


@@ -640,10 +631,10 @@ isLegacyHLSBindist path = do
 -- | Install an unpacked hls distribution.
 installHLSUnpacked :: (MonadMask m, MonadUnliftIO m, MonadReader env m, MonadFail m, HasLog env, HasDirs env, HasSettings env, MonadCatch m, MonadIO m)
                   => FilePath      -- ^ Path to the unpacked hls bindist (where the executable resides)
-                   -> InstallDirResolved      -- ^ Path to install to
+                   -> FilePath      -- ^ Path to install to
                   -> Version
                   -> Excepts '[ProcessError, CopyError, FileAlreadyExistsError, NotInstalled] m ()
-installHLSUnpacked path (fromInstallDir -> inst) _ = do
+installHLSUnpacked path inst _ = do
  lift $ logInfo "Installing HLS"
  liftIO $ createDirRecursive' inst
  lEM $ make ["PREFIX=" <> inst, "install"] (Just path)
@@ -651,13 +642,13 @@ installHLSUnpacked path (fromInstallDir -> inst) _ = do
 -- | Install an unpacked hls distribution (legacy).
 installHLSUnpackedLegacy :: (MonadReader env m, MonadFail m, HasLog env, MonadCatch m, MonadIO m)
                         => FilePath      -- ^ Path to the unpacked hls bindist (where the executable resides)
-                         -> InstallDirResolved      -- ^ Path to install to
-                         -> Version
+                         -> FilePath      -- ^ Path to install to
+                         -> Maybe Version -- ^ Nothing for isolated install
                         -> Bool          -- ^ is it a force install
                         -> Excepts '[CopyError, FileAlreadyExistsError] m ()
-installHLSUnpackedLegacy path installDir ver forceInstall = do
+installHLSUnpackedLegacy path inst mver' forceInstall = do
  lift $ logInfo "Installing HLS"
-  liftIO $ createDirRecursive' (fromInstallDir installDir)
+  liftIO $ createDirRecursive' inst

  -- install haskell-language-server-<ghcver>
  bins@(_:_) <- liftIO $ findFiles
@@ -668,18 +659,15 @@ installHLSUnpackedLegacy path installDir ver forceInstall = do
    )
  forM_ bins $ \f -> do
    let toF = dropSuffix exeExt f
-              <> (case installDir of
-                   IsolateDirResolved _ -> ""
-                   GHCupDir _ -> ("~" <>) . T.unpack . prettyVer $ ver
-                 )
+              <> maybe "" (("~" <>) . T.unpack . prettyVer) mver'
              <> exeExt

    let srcPath = path </> f
-    let destPath = fromInstallDir installDir </> toF
+    let destPath = inst </> toF

    unless forceInstall   -- if it is a force install, overwrite it.
      (liftE $ throwIfFileAlreadyExists destPath)
-
+      
    copyFileE
      srcPath
      destPath
@@ -688,21 +676,18 @@ installHLSUnpackedLegacy path installDir ver forceInstall = do
  -- install haskell-language-server-wrapper
  let wrapper = "haskell-language-server-wrapper"
      toF = wrapper
-            <> (case installDir of
-                 IsolateDirResolved _ -> ""
-                 GHCupDir _ -> ("-" <>) . T.unpack . prettyVer $ ver
-               )
+            <> maybe "" (("-" <>) . T.unpack . prettyVer) mver'
            <> exeExt
      srcWrapperPath = path </> wrapper <> exeExt
-      destWrapperPath = fromInstallDir installDir </> toF
+      destWrapperPath = inst </> toF

  unless forceInstall
    (liftE $ throwIfFileAlreadyExists destWrapperPath)
-
+      
  copyFileE
    srcWrapperPath
    destWrapperPath
-
+    
  lift $ chmod_755 destWrapperPath


@@ -723,7 +708,7 @@ installHLSBin :: ( MonadMask m
                 , MonadFail m
                 )
              => Version
-              -> InstallDir
+              -> Maybe FilePath  -- isolated install Dir (if any)
              -> Bool            -- force install
              -> Excepts
                   '[ AlreadyInstalled
@@ -742,9 +727,9 @@ installHLSBin :: ( MonadMask m
                    ]
                   m
                   ()
-installHLSBin ver installDir forceInstall = do
+installHLSBin ver isoFilepath forceInstall = do
  dlinfo <- liftE $ getDownloadInfo HLS ver
-  installHLSBindist dlinfo ver installDir forceInstall
+  installHLSBindist dlinfo ver isoFilepath forceInstall


 compileHLS :: ( MonadMask m
@@ -764,7 +749,7 @@ compileHLS :: ( MonadMask m
           -> [Version]
           -> Maybe Int
           -> Maybe Version
-           -> InstallDir
+           -> Maybe FilePath
           -> Maybe (Either FilePath URI)
           -> Maybe URI
           -> Maybe (Either FilePath [URI])  -- ^ patches
@@ -779,7 +764,7 @@ compileHLS :: ( MonadMask m
                       , BuildFailed
                       , NotInstalled
                       ] m Version
-compileHLS targetHLS ghcs jobs ov installDir cabalProject cabalProjectLocal patches cabalArgs = do
+compileHLS targetHLS ghcs jobs ov isolateDir cabalProject cabalProjectLocal patches cabalArgs = do
  PlatformRequest { .. } <- lift getPlatformReq
  GHCupInfo { _ghcupDownloads = dls } <- lift getGHCupInfo
  Dirs { .. } <- lift getDirs
@@ -820,7 +805,7 @@ compileHLS targetHLS ghcs jobs ov installDir cabalProject cabalProjectLocal patc
                  , "origin"
                  , fromString rep ]

-        let fetch_args =
+        let fetch_args = 
                  [ "fetch"
                  , "--depth"
                  , "1"
@@ -852,8 +837,8 @@ compileHLS targetHLS ghcs jobs ov installDir cabalProject cabalProjectLocal patc
    workdir
    Nothing
    (reThrowAll @_ @'[GPGError, DownloadFailed, DigestError, PatchFailed, ProcessError, FileAlreadyExistsError, CopyError] @'[BuildFailed] (BuildFailed workdir) $ do
-      let tmpInstallDir = workdir </> "out"
-      liftIO $ createDirRecursive' tmpInstallDir
+      let installDir = workdir </> "out"
+      liftIO $ createDirRecursive' installDir

      -- apply patches
      liftE $ applyAnyPatch patches workdir
@@ -876,8 +861,8 @@ compileHLS targetHLS ghcs jobs ov installDir cabalProject cabalProjectLocal patc
        cpl <- liftE $ download uri Nothing Nothing tmpUnpack (Just (cp <.> "local")) False
        copyFileE cpl (workdir </> cp <.> "local")
      artifacts <- forM (sort ghcs) $ \ghc -> do
-        let ghcInstallDir = tmpInstallDir </> T.unpack (prettyVer ghc)
-        liftIO $ createDirRecursive' tmpInstallDir
+        let ghcInstallDir = installDir </> T.unpack (prettyVer ghc)
+        liftIO $ createDirRecursive' installDir
        lift $ logInfo $ "Building HLS " <> prettyVer installVer <> " for GHC version " <> prettyVer ghc
        liftE $ lEM @_ @'[ProcessError] $
          execLogged "cabal" ( [ "v2-install"
@@ -900,17 +885,17 @@ compileHLS targetHLS ghcs jobs ov installDir cabalProject cabalProjectLocal patc

      forM_ artifacts $ \artifact -> do
        liftIO $ renameFile (artifact </> "haskell-language-server" <.> exeExt)
-          (tmpInstallDir </> "haskell-language-server-" <> takeFileName artifact <.> exeExt)
+          (installDir </> "haskell-language-server-" <> takeFileName artifact <.> exeExt)
        liftIO $ renameFile (artifact </> "haskell-language-server-wrapper" <.> exeExt)
-          (tmpInstallDir </> "haskell-language-server-wrapper" <.> exeExt)
+          (installDir </> "haskell-language-server-wrapper" <.> exeExt)
        liftIO $ rmPathForcibly artifact

-      case installDir of
-        IsolateDir isoDir -> do
+      case isolateDir of
+        Just isoDir -> do
          lift $ logInfo $ "isolated installing HLS to " <> T.pack isoDir
-          liftE $ installHLSUnpackedLegacy tmpInstallDir (IsolateDirResolved isoDir) installVer True
-        GHCupInternal -> do
-          liftE $ installHLSUnpackedLegacy tmpInstallDir (GHCupDir binDir) installVer True
+          liftE $ installHLSUnpackedLegacy installDir isoDir Nothing True
+        Nothing -> do
+          liftE $ installHLSUnpackedLegacy installDir binDir (Just installVer) True
    )

  pure installVer
@@ -934,7 +919,7 @@ installStackBin :: ( MonadMask m
                   , MonadFail m
                   )
                => Version
-                -> InstallDir
+                -> Maybe FilePath  -- ^ isolate install Dir (if any)
                -> Bool            -- ^ Force install
                -> Excepts
                     '[ AlreadyInstalled
@@ -951,9 +936,9 @@ installStackBin :: ( MonadMask m
                      ]
                     m
                     ()
-installStackBin ver installDir forceInstall = do
+installStackBin ver isoFilepath forceInstall = do
  dlinfo <- liftE $ getDownloadInfo Stack ver
-  installStackBindist dlinfo ver installDir forceInstall
+  installStackBindist dlinfo ver isoFilepath forceInstall


 -- | Like 'installStackBin', except takes the 'DownloadInfo' as
@@ -972,7 +957,7 @@ installStackBindist :: ( MonadMask m
                       )
                    => DownloadInfo
                    -> Version
-                    -> InstallDir
+                    -> Maybe FilePath -- ^ isolate install Dir (if any)
                    -> Bool           -- ^ Force install
                    -> Excepts
                         '[ AlreadyInstalled
@@ -989,7 +974,7 @@ installStackBindist :: ( MonadMask m
                          ]
                         m
                         ()
-installStackBindist dlinfo ver installDir forceInstall = do
+installStackBindist dlinfo ver isoFilepath forceInstall = do
  lift $ logDebug $ "Requested to install stack version " <> prettyVer ver

  PlatformRequest {..} <- lift getPlatformReq
@@ -1000,12 +985,12 @@ installStackBindist dlinfo ver installDir forceInstall = do
  if
    | not forceInstall
    , regularStackInstalled
-    , GHCupInternal <- installDir -> do
+    , Nothing <- isoFilepath -> do
        throwE $ AlreadyInstalled Stack ver

    | forceInstall
    , regularStackInstalled
-    , GHCupInternal <- installDir -> do
+    , Nothing <- isoFilepath -> do
        lift $ logInfo "Removing the currently installed version of Stack first!"
        liftE $ rmStackVer ver

@@ -1022,36 +1007,33 @@ installStackBindist dlinfo ver installDir forceInstall = do
  -- the subdir of the archive where we do the work
  workdir <- maybe (pure tmpUnpack) (liftE . intoSubdir tmpUnpack) (view dlSubdir dlinfo)

-  case installDir of
-    IsolateDir isoDir -> do                 -- isolated install
+  case isoFilepath of
+    Just isoDir -> do                 -- isolated install
      lift $ logInfo $ "isolated installing Stack to " <> T.pack isoDir
-      liftE $ installStackUnpacked workdir (IsolateDirResolved isoDir) ver forceInstall
-    GHCupInternal -> do                     -- regular install
-      liftE $ installStackUnpacked workdir (GHCupDir binDir) ver forceInstall
+      liftE $ installStackUnpacked workdir isoDir Nothing forceInstall
+    Nothing -> do                     -- regular install
+      liftE $ installStackUnpacked workdir binDir (Just ver) forceInstall


 -- | Install an unpacked stack distribution.
 installStackUnpacked :: (MonadReader env m, HasLog env, MonadCatch m, MonadIO m)
              => FilePath      -- ^ Path to the unpacked stack bindist (where the executable resides)
-              -> InstallDirResolved
-              -> Version
+              -> FilePath      -- ^ Path to install to
+              -> Maybe Version -- ^ Nothing for isolated installs
              -> Bool          -- ^ Force install
              -> Excepts '[CopyError, FileAlreadyExistsError] m ()
-installStackUnpacked path installDir ver forceInstall = do
+installStackUnpacked path inst mver' forceInstall = do
  lift $ logInfo "Installing stack"
  let stackFile = "stack"
-  liftIO $ createDirRecursive' (fromInstallDir installDir)
+  liftIO $ createDirRecursive' inst
  let destFileName = stackFile
-                     <> (case installDir of
-                          IsolateDirResolved _ -> ""
-                          GHCupDir _ -> ("-" <>) .  T.unpack . prettyVer $ ver
-                        )
+                     <> maybe "" (("-" <>) .  T.unpack . prettyVer) mver'
                     <> exeExt
-      destPath = fromInstallDir installDir </> destFileName
+      destPath = inst </> destFileName

  unless forceInstall
    (liftE $ throwIfFileAlreadyExists destPath)
-
+      
  copyFileE
    (path </> stackFile <> exeExt)
    destPath
@@ -1117,7 +1099,7 @@ setGHC ver sghc mBinDir = do
      SetGHC_XY  -> do
        handle
            (\(e :: ParseError) -> lift $ logWarn (T.pack $ displayException e) >> pure Nothing)
-          $ do
+          $ do 
            (mj, mi) <- getMajorMinorV (_tvVersion ver)
            let major' = intToText mj <> "." <> intToText mi
            pure $ Just (file <> "-" <> T.unpack major')
@@ -1241,7 +1223,7 @@ setHLS :: ( MonadReader env m
          , MonadUnliftIO m
          )
       => Version
-       -> SetHLS
+       -> SetHLS -- Nothing for legacy
       -> Maybe FilePath  -- if set, signals that we're not operating in ~/.ghcup/bin
                          -- and don't want mess with other versions
       -> Excepts '[NotInstalled] m ()
@@ -1375,7 +1357,7 @@ warnAboutHlsCompatibility = do
        "Haskell IDE support may not work until this is fixed." <> "\n" <>
        "Install a different HLS version, or install and set one of the following GHCs:" <> "\n" <>
        T.pack (prettyShow supportedGHC)
-
+        
    _ -> return ()

    ------------------
@@ -1980,7 +1962,7 @@ rmGhcupDirs = do

  handleRm $ rmEnvFile  envFilePath
  handleRm $ rmConfFile confFilePath
-
+  
  -- for xdg dirs, the order matters here
  handleRm $ rmDir logsDir
  handleRm $ rmDir cacheDir
@@ -2054,7 +2036,7 @@ rmGhcupDirs = do
      cs <- liftIO $ listDirectory fp >>= filterM doesDirectoryExist . fmap (fp </>)
      forM_ cs removeEmptyDirsRecursive
      hideError InappropriateType $ removeDirIfEmptyOrIsSymlink fp
-
+        

    -- we expect only files inside cache/log dir
    -- we report remaining files/dirs later,
@@ -2139,7 +2121,7 @@ compileGHC :: ( MonadMask m
           -> [Text]                   -- ^ additional args to ./configure
           -> Maybe String             -- ^ build flavour
           -> Bool
-           -> InstallDir
+           -> Maybe FilePath           -- ^ isolate dir
           -> Excepts
                '[ AlreadyInstalled
                 , BuildFailed
@@ -2164,7 +2146,7 @@ compileGHC :: ( MonadMask m
                 ]
                m
                GHCTargetVersion
-compileGHC targetGhc ov bstrap jobs mbuildConfig patches aargs buildFlavour hadrian installDir
+compileGHC targetGhc ov bstrap jobs mbuildConfig patches aargs buildFlavour hadrian isolateDir
  = do
    PlatformRequest { .. } <- lift getPlatformReq
    GHCupInfo { _ghcupDownloads = dls } <- lift getGHCupInfo
@@ -2205,7 +2187,7 @@ compileGHC targetGhc ov bstrap jobs mbuildConfig patches aargs buildFlavour hadr
                    , "origin"
                    , fromString rep ]

-          let fetch_args =
+          let fetch_args = 
                    [ "fetch"
                    , "--depth"
                    , "1"
@@ -2237,18 +2219,18 @@ compileGHC targetGhc ov bstrap jobs mbuildConfig patches aargs buildFlavour hadr
    alreadySet <- fmap (== Just installVer) $ lift $ ghcSet (_tvTarget installVer)

    when alreadyInstalled $ do
-      case installDir of
-        IsolateDir isoDir ->
+      case isolateDir of
+        Just isoDir ->
          lift $ logWarn $ "GHC " <> T.pack (prettyShow installVer) <> " already installed. Isolate installing to " <> T.pack isoDir
-        GHCupInternal ->
+        Nothing ->
          lift $ logWarn $ "GHC " <> T.pack (prettyShow installVer) <> " already installed. Will overwrite existing version."
      lift $ logWarn
        "...waiting for 10 seconds before continuing, you can still abort..."
      liftIO $ threadDelay 10000000 -- give the user a sec to intervene

-    ghcdir <- case installDir of
-      IsolateDir isoDir -> pure $ IsolateDirResolved isoDir
-      GHCupInternal -> GHCupDir <$> lift (ghcupGHCDir installVer)
+    ghcdir <- case isolateDir of
+      Just isoDir -> pure isoDir
+      Nothing -> lift $ ghcupGHCDir installVer

    (mBindist, bmk) <- liftE $ runBuildAction
      tmpUnpack
@@ -2261,13 +2243,13 @@ compileGHC targetGhc ov bstrap jobs mbuildConfig patches aargs buildFlavour hadr
        pure (b, bmk)
      )

-    case installDir of
-      GHCupInternal ->
+    case isolateDir of
+      Nothing ->
        -- only remove old ghc in regular installs
        when alreadyInstalled $ do
          lift $ logInfo "Deleting existing installation"
          liftE $ rmGHCVer installVer
-
+          
      _ -> pure ()

    forM_ mBindist $ \bindist -> do
@@ -2277,21 +2259,21 @@ compileGHC targetGhc ov bstrap jobs mbuildConfig patches aargs buildFlavour hadr
                               (installVer ^. tvVersion)
                               False       -- not a force install, since we already overwrite when compiling.

-    liftIO $ B.writeFile (fromInstallDir ghcdir </> ghcUpSrcBuiltFile) bmk
-
-    case installDir of
+    liftIO $ B.writeFile (ghcdir </> ghcUpSrcBuiltFile) bmk
+    
+    case isolateDir of
      -- set and make symlinks for regular (non-isolated) installs
-      GHCupInternal -> do
+      Nothing -> do
        reThrowAll GHCupSetError $ postGHCInstall installVer
        -- restore
        when alreadySet $ liftE $ void $ setGHC installVer SetGHCOnly Nothing
-
+        
      _ -> pure ()

    pure installVer

 where
-  defaultConf =
+  defaultConf = 
    let cross_mk = $(LitE . StringL <$> (qAddDependentFile "data/build_mk/cross" >> runIO (readFile "data/build_mk/cross")))
        default_mk = $(LitE . StringL <$> (qAddDependentFile "data/build_mk/default" >> runIO (readFile "data/build_mk/default")))
    in case targetGhc of
@@ -2310,7 +2292,7 @@ compileGHC targetGhc ov bstrap jobs mbuildConfig patches aargs buildFlavour hadr
                           )
                        => GHCTargetVersion
                        -> FilePath
-                        -> InstallDirResolved
+                        -> FilePath
                        -> Excepts
                             '[ FileDoesNotExistError
                              , HadrianNotFound
@@ -2369,7 +2351,7 @@ compileGHC targetGhc ov bstrap jobs mbuildConfig patches aargs buildFlavour hadr
                        )
                     => GHCTargetVersion
                     -> FilePath
-                     -> InstallDirResolved
+                     -> FilePath
                     -> Excepts
                          '[ FileDoesNotExistError
                           , HadrianNotFound
@@ -2504,7 +2486,7 @@ compileGHC targetGhc ov bstrap jobs mbuildConfig patches aargs buildFlavour hadr
                      )
                   => GHCTargetVersion
                   -> FilePath
-                   -> InstallDirResolved
+                   -> FilePath
                   -> Excepts
                        '[ FileDoesNotExistError
                         , InvalidBuildConfig
@@ -2515,7 +2497,7 @@ compileGHC targetGhc ov bstrap jobs mbuildConfig patches aargs buildFlavour hadr
                         ]
                        m
                        ()
-  configureBindist tver workdir (fromInstallDir -> ghcdir) = do
+  configureBindist tver workdir ghcdir = do
    lift $ logInfo [s|configuring build|]

    if | _tvVersion tver >= [vver|8.8.0|] -> do
@@ -2605,7 +2587,6 @@ upgradeGHCup :: ( MonadMask m
             => Maybe FilePath    -- ^ full file destination to write ghcup into
             -> Bool              -- ^ whether to force update regardless
                                  --   of currently installed version
-             -> Bool              -- ^ whether to throw an error if ghcup is shadowed
             -> Excepts
                  '[ CopyError
                   , DigestError
@@ -2614,16 +2595,15 @@ upgradeGHCup :: ( MonadMask m
                   , DownloadFailed
                   , NoDownload
                   , NoUpdate
-                   , GHCupShadowed
                   ]
                  m
                  Version
-upgradeGHCup mtarget force' fatal = do
+upgradeGHCup mtarget force' = do
  Dirs {..} <- lift getDirs
  GHCupInfo { _ghcupDownloads = dls } <- lift getGHCupInfo

  lift $ logInfo "Upgrading GHCup..."
-  let latestVer = fst (fromJust (getLatest dls GHCup))
+  let latestVer = fromJust $ fst <$> getLatest dls GHCup
  (Just ghcupPVPVer) <- pure $ pvpToVersion ghcUpVer ""
  when (not force' && (latestVer <= ghcupPVPVer)) $ throwE NoUpdate
  dli   <- liftE $ getDownloadInfo GHCup latestVer
@@ -2645,18 +2625,15 @@ upgradeGHCup mtarget force' fatal = do
    lift $ logWarn $ T.pack (takeFileName destFile) <> " is not in PATH! You have to add it in order to use ghcup."
  liftIO (isShadowed destFile) >>= \case
    Nothing -> pure ()
-    Just pa
-      | fatal -> throwE (GHCupShadowed pa destFile latestVer)
-      | otherwise ->
-        lift $ logWarn $ "ghcup is shadowed by "
-          <> T.pack pa
-          <> ". The upgrade will not be in effect, unless you remove "
-          <> T.pack pa
-          <> " or make sure "
-          <> T.pack destDir
-          <> " comes before "
-          <> T.pack (takeDirectory pa)
-          <> " in PATH."
+    Just pa -> lift $ logWarn $ "ghcup is shadowed by "
+      <> T.pack pa
+      <> ". The upgrade will not be in effect, unless you remove "
+      <> T.pack pa
+      <> " or make sure "
+      <> T.pack destDir
+      <> " comes before "
+      <> T.pack (takeFileName pa)
+      <> " in PATH."

  pure latestVer

--- a/lib/GHCup/Errors.hs
+++ b/lib/GHCup/Errors.hs
@@ -27,7 +27,6 @@ import           Data.CaseInsensitive           ( CI )
 import           Data.Text                      ( Text )
 import           Data.Versions
 import           Haskus.Utils.Variant
-import           System.FilePath
 import           Text.PrettyPrint               hiding ( (<>) )
 import           Text.PrettyPrint.HughesPJClass hiding ( (<>) )
 import           URI.ByteString
@@ -292,24 +291,6 @@ instance Pretty HadrianNotFound where
  pPrint HadrianNotFound =
    text "Could not find Hadrian build files. Does this GHC version support Hadrian builds?"

-data GHCupShadowed = GHCupShadowed
-                       FilePath  -- shadow binary
-                       FilePath  -- upgraded binary
-                       Version   -- upgraded version
-  deriving Show
-
-instance Pretty GHCupShadowed where
-  pPrint (GHCupShadowed sh up _) =
-    text ("ghcup is shadowed by "
-         <> sh
-         <> ". The upgrade will not be in effect, unless you remove "
-         <> sh
-         <> " or make sure "
-         <> takeDirectory up
-         <> " comes before "
-         <> takeDirectory sh
-         <> " in PATH."
-         )

    -------------------------
    --[ High-level errors ]--
--- a/lib/GHCup/Types.hs
+++ b/lib/GHCup/Types.hs
@@ -628,16 +628,3 @@ data CapturedProcess = CapturedProcess
  deriving (Eq, Show)

 makeLenses ''CapturedProcess
-
-
-data InstallDir = IsolateDir FilePath
-                | GHCupInternal
-  deriving (Eq, Show)
-
-data InstallDirResolved = IsolateDirResolved FilePath
-                        | GHCupDir FilePath
-  deriving (Eq, Show)
-
-fromInstallDir :: InstallDirResolved -> FilePath
-fromInstallDir (IsolateDirResolved fp) = fp
-fromInstallDir (GHCupDir fp) = fp
--- a/lib/GHCup/Utils.hs
+++ b/lib/GHCup/Utils.hs
@@ -317,10 +317,10 @@ ghcSet mtarget = do
           MP.setInput rest
           pure x
         )
-        <* MP.some pathSep
+        <* pathSep
        <* MP.takeRest
        <* MP.eof
-    ghcSubPath = MP.some pathSep <* MP.chunk "ghc" *> MP.some pathSep
+    ghcSubPath = pathSep <* MP.chunk "ghc" *> 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 *> MP.some pathSep
+  stripPathComponet = parseUntil1 pathSep *> pathSep
  -- parses an absolute path up until the last path separator,
  -- e.g. "/bar/baz/foo" -> "/bar/baz/", leaving "foo"
-  stripAbsolutePath = MP.some pathSep *> MP.many (MP.try stripPathComponet)
+  stripAbsolutePath = 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 *> MP.some pathSep
+    stripPathComponet = parseUntil1 pathSep *> pathSep
    -- parses an absolute path up until the last path separator,
    -- e.g. "/bar/baz/foo" -> "/bar/baz/", leaving "foo"
-    stripAbsolutePath = MP.some pathSep *> MP.many (MP.try stripPathComponet)
+    stripAbsolutePath = 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 *> MP.some pathSep
+    stripPathComponet = parseUntil1 pathSep *> pathSep
    -- parses an absolute path up until the last path separator,
    -- e.g. "/bar/baz/foo" -> "/bar/baz/", leaving "foo"
-    stripAbsolutePath = MP.some pathSep *> MP.many (MP.try stripPathComponet)
+    stripAbsolutePath = 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)
@@ -1265,10 +1265,9 @@ ghcBinaryName (GHCTargetVersion Nothing  _) = T.unpack ("ghc" <> T.pack exeExt)
 installDestSanityCheck :: ( MonadIO m
                          , MonadCatch m
                          ) =>
-                          InstallDirResolved ->
+                          FilePath ->
                          Excepts '[DirNotEmpty] m ()
-installDestSanityCheck (IsolateDirResolved isoDir) = do
+installDestSanityCheck isoDir = do
  hideErrorDef [doesNotExistErrorType] () $ do
    contents <- liftIO $ getDirectoryContentsRecursive isoDir
    unless (null contents) (throwE $ DirNotEmpty isoDir)
-installDestSanityCheck _ = pure ()
--- a/scripts/bootstrap/bootstrap-haskell
+++ b/scripts/bootstrap/bootstrap-haskell
@@ -126,10 +126,10 @@ _eghcup() {
 	fi
    if [ -z "${BOOTSTRAP_HASKELL_VERBOSE}" ] ; then
        # shellcheck disable=SC2086
-        "${GHCUP_BIN}/ghcup" ${args} "$@"
+        "ghcup" ${args} "$@"
    else
        # shellcheck disable=SC2086
-        "${GHCUP_BIN}/ghcup" ${args} --verbose "$@"
+        "ghcup" ${args} --verbose "$@"
    fi
 }

@@ -228,99 +228,100 @@ 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 "${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
-				x86_64|amd64)
-					;;
-				i*86)
-					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
+                case "${arch}" in
+                    x86_64|amd64)
+                        ;;
+                    i*86)
+                        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
+    fi

 	edo mkdir -p "${GHCUP_DIR}"

@@ -344,7 +345,9 @@ download_ghcup() {

 	# shellcheck disable=SC1090
    edo . "${GHCUP_DIR}"/env
-    eghcup upgrade
+    if [ -z "${BOOTSTRAP_HASKELL_NO_UPGRADE}" ] ; then
+        ghcup upgrade || yellow "Failed to upgrade ghcup, continuing anyway"
+    fi
 }

 # Figures out the users login shell and sets
@@ -733,13 +736,7 @@ fi

 edo mkdir -p "${GHCUP_BIN}"

-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
+download_ghcup

 echo
 if [ -n "${BOOTSTRAP_HASKELL_YAML}" ] ; then (>&2 ghcup -s "${BOOTSTRAP_HASKELL_YAML}" tool-requirements) ; else (>&2 ghcup tool-requirements) ; fi
--- a/scripts/bootstrap/bootstrap-haskell.ps1
+++ b/scripts/bootstrap/bootstrap-haskell.ps1
@@ -239,27 +239,7 @@ if ($Silent -and !($InstallDir)) {
  }
 } else {
  while ($true) {
-	Print-Msg -color Magenta -msg (@'
-Welcome to Haskell!
-
-This script will download and install the following programs:
-  * ghcup - The Haskell toolchain installer
-  * ghc   - The Glasgow Haskell Compiler
-  * msys2 - A linux-style toolchain environment required for many operations
-  * cabal - The Cabal build tool for managing Haskell software
-  * stack - (optional) A cross-platform program for developing Haskell projects
-  * hls   - (optional) A language server for developers to integrate with their editor/IDE
-
-Please note that ANTIVIRUS may interfere with the installation. If you experience problems, consider
-disabling it temporarily.
-
-Where to install to (this should be a short Path, preferably a Drive like 'C:\')?
-If you accept this path, binaries will be installed into '{0}ghcup\bin' and msys2 into '{0}ghcup\msys64'.
-Press enter to accept the default [{0}]:
-
-'@ -f $defaultGhcupBasePrefix)
-
-
+    Print-Msg -color Magenta -msg ('Where to install to (this should be a short Path, preferably a Drive like ''C:\''){1}Press enter to accept the default [{0}]:' -f $defaultGhcupBasePrefix, "`n")
    $basePrefixPrompt = Read-Host
    $GhcupBasePrefix = ($defaultGhcupBasePrefix,$basePrefixPrompt)[[bool]$basePrefixPrompt]
    if (!($GhcupBasePrefix.EndsWith('\'))) {
--- a/stack.yaml
+++ b/stack.yaml
@@ -1,4 +1,4 @@
-resolver: lts-18.28
+resolver: lts-18.27

 packages:
  - .