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

Fix HLS install via compile

Browse Source
This commit is contained in:
Julian Ospald 2022-05-21 15:03:20 +02:00
parent b5fb8772fe
commit 68c81577a4
Signed by: hasufell
GPG Key ID: 3786C5262ECB4A3F
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/GHCup.hs
View File

@ -710,6 +710,10 @@ installHLSUnpackedLegacy path installDir ver forceInstall = do
let srcPath = path </> f let srcPath = path </> f
let destPath = fromInstallDir installDir </> toF let destPath = fromInstallDir installDir </> toF
-- destination could be an existing symlink
-- for new make-based HLSes
liftIO $ rmFileForce destPath
copyFileE copyFileE
srcPath srcPath
destPath destPath
@ -727,6 +731,7 @@ installHLSUnpackedLegacy path installDir ver forceInstall = do
srcWrapperPath = path </> wrapper <> exeExt srcWrapperPath = path </> wrapper <> exeExt
destWrapperPath = fromInstallDir installDir </> toF destWrapperPath = fromInstallDir installDir </> toF
liftIO $ rmFileForce destWrapperPath
copyFileE copyFileE
srcWrapperPath srcWrapperPath
destWrapperPath destWrapperPath
@ -935,7 +940,6 @@ compileHLS targetHLS ghcs jobs ov installDir cabalProject cabalProjectLocal patc
(tmpInstallDir </> "haskell-language-server-" <> takeFileName artifact <.> exeExt) (tmpInstallDir </> "haskell-language-server-" <> takeFileName artifact <.> exeExt)
liftIO $ renameFile (artifact </> "haskell-language-server-wrapper" <.> exeExt) liftIO $ renameFile (artifact </> "haskell-language-server-wrapper" <.> exeExt)
(tmpInstallDir </> "haskell-language-server-wrapper" <.> exeExt) (tmpInstallDir </> "haskell-language-server-wrapper" <.> exeExt)
liftIO $ hideError NoSuchThing $ rmFile artifact
case installDir of case installDir of
IsolateDir isoDir -> do IsolateDir isoDir -> do