From 775c541895399657d4e3e1acbc692496e32f3385 Mon Sep 17 00:00:00 2001 From: Julian Ospald Date: Mon, 16 Mar 2020 10:49:34 +0100 Subject: [PATCH] Minor refactor --- lib/GHCup.hs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/GHCup.hs b/lib/GHCup.hs index 4beeecc..a25a89f 100644 --- a/lib/GHCup.hs +++ b/lib/GHCup.hs @@ -336,11 +336,11 @@ listVersions av lt criteria = case lt of pure ListResult { lVer = v, lTag = tags, lTool = t, .. } Cabal -> do lSet <- fmap (== v) $ cabalSet - lInstalled <- cabalInstalled v + let lInstalled = lSet pure ListResult { lVer = v, lTag = tags, lTool = t, fromSrc = False, .. } GHCup -> do let lSet = prettyPVP ghcUpVer == prettyVer v - let lInstalled = True + let lInstalled = lSet pure ListResult { lVer = v, lTag = tags, lTool = t, fromSrc = False, .. } @@ -651,7 +651,7 @@ upgradeGHCup :: ( MonadMask m Version upgradeGHCup dls mtarget = do lift $ $(logInfo) [i|Upgrading GHCup...|] - let latestVer = head $ getTagged dls GHCup Latest + let latestVer = fromJust $ getLatest dls GHCup dli <- liftE $ getDownloadInfo dls GHCup latestVer Nothing tmp <- lift withGHCupTmpDir let fn = [rel|ghcup|]