From d7a86d850021b900d596a253e54c1b044d3dc097 Mon Sep 17 00:00:00 2001 From: MSP-Greg Date: Fri, 22 May 2020 12:21:09 -0500 Subject: [PATCH] Windows - Install-Msys2.ps1 - remove p7zip / 7z package (#916) Due to conflicts with two installed versions --- images/win/scripts/Installers/Install-Msys2.ps1 | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/images/win/scripts/Installers/Install-Msys2.ps1 b/images/win/scripts/Installers/Install-Msys2.ps1 index f91f6b3d..8c5f859f 100644 --- a/images/win/scripts/Installers/Install-Msys2.ps1 +++ b/images/win/scripts/Installers/Install-Msys2.ps1 @@ -18,7 +18,7 @@ $msys2Uri = ((Invoke-RestMethod $msys2_release).assets | Where-Object { $msys2File = "$env:TEMP\msys2.tar.xz" # Download the latest msys2 x86_64 -Write-Host "Starting msys2 download" +Write-Host "Starting msys2 download using $($msys2Uri.split('/')[-1])" (New-Object System.Net.WebClient).DownloadFile($msys2Uri, $msys2File) Write-Host "Finished download" @@ -45,9 +45,9 @@ bash.exe -c "pacman-key --init 2>&1" Write-Host "bash pacman-key --populate msys2" bash.exe -c "pacman-key --populate msys2 2>&1" -Write-Host "pacman --noconfirm -Sy pacman" -pacman --noconfirm -Sy pacman -pacman --noconfirm -Su +Write-Host "pacman -Sy --noconfirm --needed pacman" +pacman -Sy --noconfirm --needed pacman +pacman -Su --noconfirm # Force stop gpg-agent to continue installation Get-Process gpg-agent -ErrorAction SilentlyContinue | Stop-Process -Force @@ -59,6 +59,9 @@ pacman.exe -Syuu --noconfirm Write-Host "Install msys2 packages" pacman.exe -S --noconfirm --needed --noprogressbar base-devel compression +Write-Host "Remove p7zip/7z package due to conflicts" +pacman.exe -R --noconfirm --noprogressbar p7zip + # mingw package list $tools = "___clang ___cmake ___llvm ___toolchain ___ragel"