Skip to content

Commit e5ec774

Browse files
committed
vagrant environment: install msys2 from our own package source
1 parent 2434e2e commit e5ec774

File tree

1 file changed

+11
-1
lines changed

1 file changed

+11
-1
lines changed

Vagrantfile-provision.ps1

+11-1
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,17 @@ git config --global mergetool.meld.cmd '\"C:/Program Files (x86)/Meld/Meld.exe\"
8787
#git config --list --show-origin
8888

8989
# install msys2.
90-
choco install -y msys2
90+
# NB we have to manually build the msys2 package from source because the
91+
# current chocolatey package is somewhat brittle to install.
92+
Push-Location $env:TEMP
93+
$p = Start-Process git clone,https://github.com/rgl/choco-packages -PassThru -Wait
94+
if ($p.ExitCode) {
95+
throw "git failed with exit code $($p.ExitCode)"
96+
}
97+
cd choco-packages/msys2
98+
choco pack
99+
choco install -y msys2 -Source $PWD
100+
Pop-Location
91101

92102
# configure the msys2 launcher to let the shell inherith the PATH.
93103
$msys2BasePath = 'C:\tools\msys64'

0 commit comments

Comments
 (0)