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

Fix behaviour of non-Hadrian builds

Browse Source 
getFileStatus will resolve symbolic links. getSymbolicLinkStatus doesn't.
This commit is contained in:
Brian McKenna 2020-06-20 03:38:34 +00:00
parent d276bfb3ec
commit febe6fcb35
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/GHCup/Utils.hs
View File

@ -54,7 +54,7 @@ import System.IO.Error
import System.Posix.FilePath ( getSearchPath import System.Posix.FilePath ( getSearchPath
, takeFileName , takeFileName
) )
import System.Posix.Files.ByteString ( getFileStatus, isSymbolicLink, readSymbolicLink ) import System.Posix.Files.ByteString ( getSymbolicLinkStatus, isSymbolicLink, readSymbolicLink )
import Text.Regex.Posix import Text.Regex.Posix
import URI.ByteString import URI.ByteString
@ -434,7 +434,7 @@ ghcToolFiles ver = do
-- GHC is moving some builds to Hadrian for bindists, which doesn't create versioned binaries -- GHC is moving some builds to Hadrian for bindists, which doesn't create versioned binaries
-- https://gitlab.haskell.org/haskell/ghcup-hs/issues/31 -- https://gitlab.haskell.org/haskell/ghcup-hs/issues/31
isHadrian :: ByteString -> IO Bool isHadrian :: ByteString -> IO Bool
isHadrian = (not . isSymbolicLink <$>) . getFileStatus isHadrian = (not . isSymbolicLink <$>) . getSymbolicLinkStatus
-- | This file, when residing in ~/.ghcup/ghc/<ver>/ signals that -- | This file, when residing in ~/.ghcup/ghc/<ver>/ signals that