summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--tools/bootstrap-0
-rw-r--r--tools/bootstrap-windows.ps15
2 files changed, 3 insertions, 2 deletions
diff --git a/tools/bootstrap- b/tools/bootstrap-
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/tools/bootstrap-
diff --git a/tools/bootstrap-windows.ps1 b/tools/bootstrap-windows.ps1
index df4ceaf6..8b60018c 100644
--- a/tools/bootstrap-windows.ps1
+++ b/tools/bootstrap-windows.ps1
@@ -135,11 +135,12 @@ $MSYS2_Dir = (Get-MSYS2)
if (!$MSYS2_Dir) {
Write-Host "MSYS2 not found, installing..."
choco install msys2 --params "/InstallDir:C:\msys64"
+ $MSYS2_Dir = "C:\msys64"
}
-C:\msys64\usr\bin\bash -lc 'pacman -Qq winpty &>/dev/null'
+& $MSYS2_Dir\usr\bin\bash -lc 'pacman -Qq winpty &>/dev/null'
if (!$?) {
- C:\msys64\usr\bin\bash -lc 'pacman --noconfirm -S --needed winpty'
+ & $MSYS2_Dir\usr\bin\bash -lc 'pacman --noconfirm -S --needed winpty'
}
if (!((Get-Content "$MSYS2_Dir\ucrt64.ini") -clike "MSYS2_PATH_TYPE=inherit")) {
Add-Content "$MSYS2_Dir\ucrt64.ini" "`nMSYS2_PATH_TYPE=inherit"