hasufell/ghcup-hs
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

updates usages of new installStackBin across files

Browse Source
This commit is contained in:
Arjun Kathuria 2021-07-25 22:24:38 +05:30
parent 6b89646c1e
commit 911089f334
3 changed files with 18 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/ghcup/BrickMain.hs
View File

@ -460,7 +460,7 @@ install' _ (_, ListResult {..}) = do
liftE $ installHLSBin lVer Nothing $> vi liftE $ installHLSBin lVer Nothing $> vi
Stack -> do Stack -> do
let vi = getVersionInfo lVer Stack dls let vi = getVersionInfo lVer Stack dls
liftE $ installStackBin lVer $> vi liftE $ installStackBin lVer Nothing $> vi
) )
>>= \case >>= \case
VRight vi -> do VRight vi -> do

34
app/ghcup/Main.hs
View File

@ -1737,26 +1737,20 @@ Report bugs at <https://gitlab.haskell.org/haskell/ghcup-hs/issues>|]
pure $ ExitFailure 4 pure $ ExitFailure 4
let installStack InstallOptions{..} = let installStack InstallOptions{..} =
(case isolateDir of (case instBindist of
Just isoDir -> runInstTool instPlatform $ do Nothing -> runInstTool instPlatform $ do
(v, vi) <- liftE $ fromVersion instVer Stack (v, vi) <- liftE $ fromVersion instVer Stack
let stackVersion = (_tvVersion v) liftE $ installStackBin (_tvVersion v) isolateDir
liftE $ installStackBinIsolated isoDir stackVersion pure vi
pure vi Just uri -> do
Nothing -> s' <- appState
case instBindist of runInstTool' s'{ settings = settings { noVerify = True}} instPlatform $ do
Nothing -> runInstTool instPlatform $ do (v, vi) <- liftE $ fromVersion instVer Stack
(v, vi) <- liftE $ fromVersion instVer Stack liftE $ installStackBindist
liftE $ installStackBin (_tvVersion v) (DownloadInfo uri Nothing "")
pure vi (_tvVersion v)
Just uri -> do isolateDir
s' <- appState pure vi
runInstTool' s'{ settings = settings { noVerify = True}} instPlatform $ do
(v, vi) <- liftE $ fromVersion instVer Stack
liftE $ installStackBindist
(DownloadInfo uri Nothing "")
(_tvVersion v)
pure vi
) )
>>= \case >>= \case
VRight vi -> do VRight vi -> do

5
lib/GHCup.hs
View File

@ -671,6 +671,7 @@ installStackBin :: ( MonadMask m
, MonadFail m , MonadFail m
) )
=> Version => Version
-> Maybe FilePath
-> Excepts -> Excepts
'[ AlreadyInstalled '[ AlreadyInstalled
, CopyError , CopyError
@ -686,9 +687,9 @@ installStackBin :: ( MonadMask m
] ]
m m
() ()
installStackBin ver = do installStackBin ver isoFilepath = do
dlinfo <- liftE $ getDownloadInfo Stack ver dlinfo <- liftE $ getDownloadInfo Stack ver
installStackBindist dlinfo ver installStackBindist dlinfo ver isoFilepath
-- | Like 'installStackBin', except takes the 'DownloadInfo' as -- | Like 'installStackBin', except takes the 'DownloadInfo' as