Compare commits
1 Commits
PR/fix-109
...
PR/ubunbu-
| Author | SHA1 | Date | |
|---|---|---|---|
| 48cf0b1f67 |
@@ -28,7 +28,7 @@ toolRequirements:
|
||||
- libncurses5
|
||||
- libtinfo5
|
||||
notes: ''
|
||||
">= 20.04":
|
||||
"( >= 20.04 && < 20.10 )":
|
||||
distroPKGs:
|
||||
- build-essential
|
||||
- curl
|
||||
@@ -40,6 +40,18 @@ toolRequirements:
|
||||
- libncurses5
|
||||
- libtinfo5
|
||||
notes: ''
|
||||
"( >= 20.10 )":
|
||||
distroPKGs:
|
||||
- build-essential
|
||||
- curl
|
||||
- libffi-dev
|
||||
- libffi8ubuntu1
|
||||
- libgmp-dev
|
||||
- libgmp10
|
||||
- libncurses-dev
|
||||
- libncurses5
|
||||
- libtinfo5
|
||||
notes: ''
|
||||
Linux_CentOS:
|
||||
'( >= 7 && < 8 )':
|
||||
distroPKGs:
|
||||
|
||||
13
lib/GHCup.hs
13
lib/GHCup.hs
@@ -1314,17 +1314,12 @@ upgradeGHCup dls mtarget force pfreq = do
|
||||
tmp <- lift withGHCupTmpDir
|
||||
let fn = [rel|ghcup|]
|
||||
p <- liftE $ download dli tmp (Just fn)
|
||||
let destDir = dirname destFile
|
||||
destFile = fromMaybe (binDir </> fn) mtarget
|
||||
lift $ $(logDebug) [i|mkdir -p #{toFilePath destDir}|]
|
||||
liftIO $ createDirRecursive' destDir
|
||||
lift $ $(logDebug) [i|rm -f #{toFilePath destFile}|]
|
||||
liftIO $ hideError NoSuchThing $ deleteFile destFile
|
||||
lift $ $(logDebug) [i|cp #{toFilePath p} #{toFilePath destFile}|]
|
||||
let fullDest = fromMaybe (binDir </> fn) mtarget
|
||||
liftIO $ hideError NoSuchThing $ deleteFile fullDest
|
||||
handleIO (throwE . CopyError . show) $ liftIO $ copyFile p
|
||||
destFile
|
||||
fullDest
|
||||
Overwrite
|
||||
lift $ chmod_755 destFile
|
||||
lift $ chmod_755 fullDest
|
||||
pure latestVer
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user