move some code around for better consistency

app/ghcup/Main.hs

@@ -1783,17 +1783,20 @@ Report bugs at <https://gitlab.haskell.org/haskell/ghcup-hs/issues>|]
                 (case instBindist of
                    Nothing -> runInstTool instPlatform $ do
                      (v, vi) <- liftE $ fromVersion instVer Cabal
-                     liftE $ installCabalBin (_tvVersion v) isolateDir forceInstall
+                     liftE $ installCabalBin
+                               (_tvVersion v)
+                               isolateDir
+                               forceInstall
                      pure vi
                    Just uri -> do
                      s' <- appState
                      runInstTool' s'{ settings = settings { noVerify = True}} instPlatform $ do
                        (v, vi) <- liftE $ fromVersion instVer Cabal
                        liftE $ installCabalBindist 
-                           (DownloadInfo uri Nothing "")
-                           (_tvVersion v)
-                           isolateDir
-                           forceInstall
+                                 (DownloadInfo uri Nothing "")
+                                 (_tvVersion v)
+                                 isolateDir
+                                 forceInstall
                        pure vi
                   )
                   >>= \case

lib/GHCup.hs

@@ -441,17 +441,17 @@ installCabalBindist dlinfo ver isoFilepath forceInstall = do
   regularCabalInstalled <- lift $ checkIfToolInstalled Cabal ver
 
   if
+    | not forceInstall
+    , regularCabalInstalled
+    ,  Nothing <- isoFilepath -> do
+        throwE $ AlreadyInstalled Cabal ver
+        
     | forceInstall
     , regularCabalInstalled
     , Nothing <- isoFilepath -> do
         lift $ logInfo $ "Removing the currently installed version first!"
         liftE $ rmCabalVer ver
 
-    | not forceInstall
-    , regularCabalInstalled
-    ,  Nothing <- isoFilepath -> do
-        throwE $ AlreadyInstalled Cabal ver
-
     | otherwise -> pure ()
 
                
@@ -479,22 +479,6 @@ installCabalBindist dlinfo ver isoFilepath forceInstall = do
       let lInstCabal = headMay . reverse . sort $ cVers
       when (maybe True (ver >=) lInstCabal) $ liftE $ setCabal ver
       
-checkIfToolInstalled :: ( MonadIO m
-                        , MonadReader env m
-                        , HasDirs env
-                        , MonadCatch m) =>
-                        Tool ->
-                        Version ->
-                        m Bool
-
-checkIfToolInstalled tool ver =
-  case tool of
-    Cabal -> cabalInstalled ver
-    HLS   -> hlsInstalled ver
-    Stack -> stackInstalled ver
-    GHC   -> ghcInstalled $ mkTVer ver
-    _     -> pure False
-    
 -- | 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)
@@ -598,17 +582,17 @@ installHLSBindist dlinfo ver isoFilepath forceInstall = do
   regularHLSInstalled <- lift $ checkIfToolInstalled HLS ver
 
   if
-    | forceInstall
-    , regularHLSInstalled
-    , Nothing <- isoFilepath -> do  -- regular forced install
-        lift $ logInfo "Removing the currently installed version of HLS before force installing!"
-        liftE $ rmHLSVer ver
-
     | not forceInstall
     , regularHLSInstalled
-    , Nothing <- isoFilepath -> do  -- regular install
+    , Nothing <- isoFilepath -> do      -- regular install
         throwE $ AlreadyInstalled HLS ver
 
+    | forceInstall
+    , regularHLSInstalled
+    , 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)
@@ -2421,6 +2405,21 @@ whereIsTool tool ver@GHCTargetVersion {..} = do
       currentRunningExecPath <- liftIO getExecutablePath
       liftIO $ canonicalizePath currentRunningExecPath
 
+checkIfToolInstalled :: ( MonadIO m
+                        , MonadReader env m
+                        , HasDirs env
+                        , MonadCatch m) =>
+                        Tool ->
+                        Version ->
+                        m Bool
+
+checkIfToolInstalled tool ver =
+  case tool of
+    Cabal -> cabalInstalled ver
+    HLS   -> hlsInstalled ver
+    Stack -> stackInstalled ver
+    GHC   -> ghcInstalled $ mkTVer ver
+    _     -> pure False
 
 throwIfFileAlreadyExists :: ( MonadIO m ) =>
                             FilePath ->