Delete installCabalBinIsolated function.
This commit is contained in:
parent
bc6d006c57
commit
5995a8b592
52
lib/GHCup.hs
52
lib/GHCup.hs
@ -476,58 +476,6 @@ installCabal' path inst ver = do
|
|||||||
destPath
|
destPath
|
||||||
lift $ chmod_755 destPath
|
lift $ chmod_755 destPath
|
||||||
|
|
||||||
-- | Installs GHC to a specified location, doesn't make any symlinks.
|
|
||||||
installCabalBinIsolated :: ( MonadMask m
|
|
||||||
, MonadCatch m
|
|
||||||
, MonadReader env m
|
|
||||||
, HasPlatformReq env
|
|
||||||
, HasGHCupInfo env
|
|
||||||
, HasDirs env
|
|
||||||
, HasSettings env
|
|
||||||
, MonadLogger m
|
|
||||||
, MonadResource m
|
|
||||||
, MonadIO m
|
|
||||||
, MonadUnliftIO m
|
|
||||||
, MonadFail m
|
|
||||||
)
|
|
||||||
=> FilePath
|
|
||||||
-> Version
|
|
||||||
-> Excepts
|
|
||||||
'[ AlreadyInstalled
|
|
||||||
, CopyError
|
|
||||||
, DigestError
|
|
||||||
, DownloadFailed
|
|
||||||
, NoDownload
|
|
||||||
, NotInstalled
|
|
||||||
, UnknownArchive
|
|
||||||
, TarDirDoesNotExist
|
|
||||||
#if !defined(TAR)
|
|
||||||
, ArchiveResult
|
|
||||||
#endif
|
|
||||||
]
|
|
||||||
m
|
|
||||||
()
|
|
||||||
installCabalBinIsolated isoDir ver = do
|
|
||||||
dlinfo <- liftE $ getDownloadInfo Cabal ver
|
|
||||||
lift $ $(logDebug) [i|Requested to install cabal version #{ver}|]
|
|
||||||
|
|
||||||
-- download (or use cached version)
|
|
||||||
dl <- liftE $ downloadCached dlinfo Nothing
|
|
||||||
|
|
||||||
PlatformRequest {_rPlatform} <- lift getPlatformReq
|
|
||||||
|
|
||||||
-- unpack
|
|
||||||
tmpUnpack <- lift withGHCupTmpDir
|
|
||||||
liftE $ unpackToDir tmpUnpack dl
|
|
||||||
void $ lift $ darwinNotarization _rPlatform tmpUnpack
|
|
||||||
|
|
||||||
-- the subdir of the archive where we do the work
|
|
||||||
workdir <- maybe (pure tmpUnpack) (liftE . intoSubdir tmpUnpack) (view dlSubdir dlinfo)
|
|
||||||
|
|
||||||
lift $ $(logInfo) [i|isolated installing Cabal to #{isoDir}|]
|
|
||||||
liftE $ installCabal' workdir isoDir ver
|
|
||||||
|
|
||||||
|
|
||||||
-- | Installs cabal into @~\/.ghcup\/bin/cabal-\<ver\>@ and
|
-- | Installs cabal into @~\/.ghcup\/bin/cabal-\<ver\>@ and
|
||||||
-- creates a default @cabal -> cabal-x.y.z.q@ symlink for
|
-- creates a default @cabal -> cabal-x.y.z.q@ symlink for
|
||||||
-- the latest installed version.
|
-- the latest installed version.
|
||||||
|
Loading…
Reference in New Issue
Block a user