saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge 3007.x into master

Browse source
This commit is contained in:
Pedro Algarvio 2024-03-11 16:11:09 +00:00
commit 58d8435758
No known key found for this signature in database
GPG key ID: BB36BF6584A298FF
1 changed files with 15 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
pkg/windows/install_wix.ps1
View file

@ -74,17 +74,15 @@ if ( (Get-WindowsOptionalFeature -Online -FeatureName "NetFx3").State -eq "Enabl
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
Write-Host "Looking for Wix Toolset: " -NoNewline Write-Host "Looking for Wix Toolset: " -NoNewline
# 64bit: {03368010-193D-4AE2-B275-DD2EB32CD427} $guid_64 = "{A2D09E18-32F8-4E34-946A-33AC8C8303E9}"
# 32bit: {07188017-A460-4C0D-A386-6B3CEB8E20CD} $guid_32 = "{00A0C4F8-9F6C-40FB-A02D-3EAE1D7FD352}"
if ((ProductcodeExists "{03368010-193D-4AE2-B275-DD2EB32CD427}") ` if ( (ProductcodeExists $guid_64) -or (ProductcodeExists $guid_32) ) {
-or `
(ProductcodeExists "{07188017-A460-4C0D-A386-6B3CEB8E20CD}")) {
Write-Result "Success" -ForegroundColor Green Write-Result "Success" -ForegroundColor Green
} else { } else {
Write-Result "Missing" -ForegroundColor Yellow Write-Result "Missing" -ForegroundColor Yellow
Write-Host "Downloading Wix Toolset: " -NoNewline Write-Host "Downloading Wix Toolset: " -NoNewline
$url = "https://github.com/wixtoolset/wix3/releases/download/wix3112rtm/wix311.exe" $url = "https://github.com/wixtoolset/wix3/releases/download/wix314rtm/wix314.exe"
$file = "$env:TEMP\wix_installer.exe" $file = "$env:TEMP\wix_installer.exe"
Invoke-WebRequest -Uri $url -OutFile "$file" Invoke-WebRequest -Uri $url -OutFile "$file"
if ( Test-Path -Path "$file" ) { if ( Test-Path -Path "$file" ) {
@ -95,10 +93,17 @@ if ((ProductcodeExists "{03368010-193D-4AE2-B275-DD2EB32CD427}") `
} }
Write-Host "Installing Wix Toolset: " -NoNewline Write-Host "Installing Wix Toolset: " -NoNewline
Start-Process $file -ArgumentList "/install","/quiet","/norestart" -Wait -NoNewWindow $process = Start-Process $file -ArgumentList "/install","/quiet","/norestart" -PassThru -Wait -NoNewWindow
if ((ProductcodeExists "{03368010-193D-4AE2-B275-DD2EB32CD427}") `
-or ` if ( $process.ExitCode -eq 0 ) {
(ProductcodeExists "{07188017-A460-4C0D-A386-6B3CEB8E20CD}")) { Write-Result "Success" -ForegroundColor Green
} else {
Write-Result "Failed" -ForegroundColor Red
exit 1
}
Write-Host "Verifying Wix Toolset Installation: " -NoNewline
if ( (ProductcodeExists $guid_64) -or (ProductcodeExists $guid_32) ) {
Write-Result "Success" -ForegroundColor Green Write-Result "Success" -ForegroundColor Green
} else { } else {
Write-Result "Failed" -ForegroundColor Red Write-Result "Failed" -ForegroundColor Red