From 7189998f3b5ab7fe8801662f8c98ec74e301cbbd Mon Sep 17 00:00:00 2001
From: Julian Ospald <hasufell@posteo.de>
Date: Sat, 3 Jul 2021 11:25:49 +0200
Subject: [PATCH] Cleanup rmGhcupDirs a bit

---
 lib/GHCup.hs | 22 ++++++++--------------
 1 file changed, 8 insertions(+), 14 deletions(-)

diff --git a/lib/GHCup.hs b/lib/GHCup.hs
index c5b7e6f..9be3e1b 100644
--- a/lib/GHCup.hs
+++ b/lib/GHCup.hs
@@ -1375,11 +1375,11 @@ rmGhcupDirs = do
 
   rmEnvFile  envFilePath
   rmConfFile confFilePath
-  rmCacheDir cacheDir
-  rmLogsDir  logsDir
+  rmDir cacheDir
+  rmDir logsDir
   rmBinDir   binDir
 #if defined(IS_WINDOWS)
-  rmPath (baseDir </> "msys64")
+  rmDir (baseDir </> "msys64")
 #endif
 
   liftIO $ removeEmptyDirsRecursive baseDir
@@ -1400,17 +1400,11 @@ rmGhcupDirs = do
       $logInfo "removing Ghcup Config File"
       hideError doesNotExistErrorType $ liftIO $ deleteFile confFilePath
 
-    rmCacheDir :: (MonadLogger m, MonadIO m) => FilePath -> m ()
-    rmCacheDir cacheDir = do
-      $logInfo "removing ghcup cache Dir"
-      contents <- liftIO $ getDirectoryContentsRecursive cacheDir
-      forM_ contents (liftIO . deleteFile . (cacheDir </>))
-
-    rmLogsDir :: (MonadLogger m, MonadIO m) => FilePath -> m ()
-    rmLogsDir logsDir = do
-      $logInfo "removing ghcup logs Dir"
-      contents <- liftIO $ getDirectoryContentsRecursive logsDir
-      forM_ contents (liftIO . deleteFile . (logsDir </>))
+    rmDir :: (MonadLogger m, MonadIO m) => FilePath -> m ()
+    rmDir dir = do
+      $logInfo [i|removing #{dir}|]
+      contents <- liftIO $ getDirectoryContentsRecursive dir
+      forM_ contents (liftIO . deleteFile . (dir </>))
 
     rmBinDir :: (MonadCatch m, MonadIO m) => FilePath -> m ()
     rmBinDir binDir = do