Merge branch 'issue-1201'

haskell · Jan 7, 2025 · 6d6cb02 · 6d6cb02
2 parents ebd4f2e + 6e5e345
commit 6d6cb02
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 10 deletions.
diff --git a/lib-opt/GHCup/OptParse/Rm.hs b/lib-opt/GHCup/OptParse/Rm.hs
@@ -35,6 +35,7 @@ import           Data.Variant.Excepts
 import           Options.Applicative     hiding ( style )
 import           Prelude                 hiding ( appendFile )
 import           System.Exit
+import           Text.PrettyPrint.HughesPJClass ( prettyShow )
 
 import qualified Data.Text                     as T
 import Control.Exception.Safe (MonadMask)
@@ -176,8 +177,8 @@ rm rmCommand runAppState runLogger = case rmCommand of
       )
       >>= \case
             VRight vi -> do
+              postRmLog (tVerToText ghcVer) GHC vi
               runLogger $ logGHCPostRm ghcVer
-              postRmLog vi
               pure ExitSuccess
             VLeft  e -> do
               runLogger $ logError $ T.pack $ prettyHFError e
@@ -192,7 +193,7 @@ rm rmCommand runAppState runLogger = case rmCommand of
       )
       >>= \case
             VRight vi -> do
-              postRmLog vi
+              postRmLog (prettyVer tv) Cabal vi
               pure ExitSuccess
             VLeft  e -> do
               runLogger $ logError $ T.pack $ prettyHFError e
@@ -207,7 +208,7 @@ rm rmCommand runAppState runLogger = case rmCommand of
       )
       >>= \case
             VRight vi -> do
-              postRmLog vi
+              postRmLog (prettyVer tv) HLS vi
               pure ExitSuccess
             VLeft  e -> do
               runLogger $ logError $ T.pack $ prettyHFError e
@@ -222,12 +223,12 @@ rm rmCommand runAppState runLogger = case rmCommand of
       )
       >>= \case
             VRight vi -> do
-              postRmLog vi
+              postRmLog (prettyVer tv) Stack vi
               pure ExitSuccess
             VLeft  e -> do
               runLogger $ logError $ T.pack $ prettyHFError e
               pure $ ExitFailure 15
 
-  postRmLog vi =
-    forM_ (_viPostRemove =<< vi) $ \msg ->
-      runLogger $ logInfo msg
+  postRmLog tv tool vi = runLogger $ do
+    logInfo $ "Successfuly removed " <> T.pack (prettyShow tool) <> " " <> tv
+    forM_ (_viPostRemove =<< vi) logInfo
diff --git a/lib-tui/GHCup/Brick/Actions.hs b/lib-tui/GHCup/Brick/Actions.hs
@@ -433,21 +433,24 @@ del' (_, ListResult {..}) = do
   let run = runE @'[NotInstalled, UninstallFailed]
 
   run (do
-      let vi = getVersionInfo (GHCTargetVersion lCross lVer) lTool dls
+      let vi = getVersionInfo crossVer lTool dls
       case lTool of
-        GHC   -> liftE $ rmGHCVer (GHCTargetVersion lCross lVer) $> vi
+        GHC   -> liftE $ rmGHCVer crossVer $> vi
         Cabal -> liftE $ rmCabalVer lVer $> vi
         HLS   -> liftE $ rmHLSVer lVer $> vi
         Stack -> liftE $ rmStackVer lVer $> vi
         GHCup -> pure Nothing
     )
     >>= \case
           VRight vi -> do
-            when (lTool == GHC) $ logGHCPostRm (mkTVer lVer)
+            when (lTool == GHC) $ logGHCPostRm crossVer
+            logInfo $ "Successfuly removed " <> T.pack (prettyShow lTool) <> " " <> (if lTool == GHC then tVerToText crossVer else prettyVer lVer)
             forM_ (_viPostRemove =<< vi) $ \msg ->
               logInfo msg
             pure $ Right ()
           VLeft  e -> pure $ Left (prettyHFError e)
+ where
+  crossVer = GHCTargetVersion lCross lVer
 
 
 changelog' :: (MonadReader AppState m, MonadIO m)