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

Merge branch 'fix-bootstrap-win'

Browse Source
This commit is contained in:
Julian Ospald 2021-08-31 19:28:21 +02:00
commit 2edd1fb583
Signed by: hasufell
GPG Key ID: 3786C5262ECB4A3F
1 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
bootstrap-haskell.ps1
View File

@ -182,7 +182,7 @@ elevated command prompt:
if ($GhcupBasePrefixEnv) { if ($GhcupBasePrefixEnv) {
$defaultGhcupBasePrefix = $GhcupBasePrefixEnv $defaultGhcupBasePrefix = $GhcupBasePrefixEnv
} else { } elseif (!($InstallDir)) {
$partitions = Get-CimInstance win32_logicaldisk $partitions = Get-CimInstance win32_logicaldisk
$defaultGhcupBasePrefix = $null $defaultGhcupBasePrefix = $null
foreach ($p in $partitions){ foreach ($p in $partitions){
@ -211,10 +211,10 @@ if ($Silent -and !($InstallDir)) {
$GhcupBasePrefix = $defaultGhcupBasePrefix $GhcupBasePrefix = $defaultGhcupBasePrefix
} elseif ($InstallDir) { } elseif ($InstallDir) {
if (!(Test-Path -LiteralPath ('{0}' -f $InstallDir) -IsValid)) { if (!(Test-Path -LiteralPath ('{0}' -f $InstallDir) -IsValid)) {
Print-Msg -color Red -msg "Not a valid directory!" Print-Msg -color Red -msg "Not a valid directory! (InstallDir)"
Exit 1 Exit 1
} elseif (!(Split-Path -IsAbsolute -Path "$InstallDir")) { } elseif (!(Split-Path -IsAbsolute -Path "$InstallDir")) {
Print-Msg -color Red -msg "Non-absolute Path specified!" Print-Msg -color Red -msg "Non-absolute Path specified! (InstallDir)"
Exit 1 Exit 1
} else { } else {
$GhcupBasePrefix = $InstallDir $GhcupBasePrefix = $InstallDir
@ -245,7 +245,20 @@ $null = [Environment]::SetEnvironmentVariable("GHCUP_INSTALL_BASE_PREFIX", $Ghcu
$GhcupDir = ('{0}\ghcup' -f $GhcupBasePrefix) $GhcupDir = ('{0}\ghcup' -f $GhcupBasePrefix)
$MsysDir = ('{0}\msys64' -f $GhcupDir) if ($ExistingMsys2Dir) {
if (!(Test-Path -LiteralPath ('{0}' -f $ExistingMsys2Dir) -IsValid)) {
Print-Msg -color Red -msg "Not a valid directory! (ExistingMsys2Dir)"
Exit 1
} elseif (!(Split-Path -IsAbsolute -Path "$ExistingMsys2Dir")) {
Print-Msg -color Red -msg "Non-absolute Path specified! (ExistingMsys2Dir)"
Exit 1
} else {
$MsysDir = $ExistingMsys2Dir
}
} else {
$MsysDir = ('{0}\msys64' -f $GhcupDir)
}
$Bash = ('{0}\usr\bin\bash' -f $MsysDir) $Bash = ('{0}\usr\bin\bash' -f $MsysDir)
if (!($BootstrapUrl)) { if (!($BootstrapUrl)) {
$BootstrapUrl = 'https://www.haskell.org/ghcup/sh/bootstrap-haskell' $BootstrapUrl = 'https://www.haskell.org/ghcup/sh/bootstrap-haskell'