diff --git a/choco/chocolateyInstall.ps1.template.cmake b/choco/chocolateyInstall.ps1.template.cmake index 424a737789c..531b56145d4 100644 --- a/choco/chocolateyInstall.ps1.template.cmake +++ b/choco/chocolateyInstall.ps1.template.cmake @@ -1,18 +1,14 @@ $packageName= 'icinga2' $toolsDir = "$(Split-Path -Parent $MyInvocation.MyCommand.Definition)" -$url = 'https://packages.icinga.com/windows/Icinga2-v${CHOCO_VERSION_SHORT}-x86.msi' $url64 = 'https://packages.icinga.com/windows/Icinga2-v${CHOCO_VERSION_SHORT}-x86_64.msi' $packageArgs = @{ packageName = $packageName fileType = 'msi' - url = $url url64bit = $url64 silentArgs = "/qn /norestart" validExitCodes= @(0) softwareName = 'Icinga 2*' - checksum = '%CHOCO_32BIT_CHECKSUM%' - checksumType = 'sha256' checksum64 = '%CHOCO_64BIT_CHECKSUM%' checksumType64= 'sha256' } diff --git a/tools/win32/build-choco.ps1 b/tools/win32/build-choco.ps1 index 32138bdf272..2ee0f075c78 100644 --- a/tools/win32/build-choco.ps1 +++ b/tools/win32/build-choco.ps1 @@ -15,21 +15,13 @@ if(-not (Test-Path "$($env:ICINGA2_BUILDPATH)\choco\chocolateyInstall.ps1.templa $chocoInstallScriptTemplatePath = "$($env:ICINGA2_BUILDPATH)\choco\chocolateyInstall.ps1.template" $chocoInstallScript = Get-Content $chocoInstallScriptTemplatePath -if(-not (Test-Path "$($env:ICINGA2_BUILDPATH)\*-x86.msi")) { - throw "Could not find Icinga 2 32 bit MSI package. Abort." -} - -$hashMSIpackage32 = Get-FileHash "$($env:ICINGA2_BUILDPATH)\*-x86.msi" -Write-Output "File Hash for 32 bit MSI package: $($hashMSIpackage32.Hash)." - if(-not (Test-Path "$($env:ICINGA2_BUILDPATH)\*-x86_64.msi")) { throw "Could not find Icinga 2 64 bit MSI package. Abort." } $hashMSIpackage64 = Get-FileHash "$($env:ICINGA2_BUILDPATH)\*-x86_64.msi" -Write-Output "File Hash for 32 bit MSI package: $($hashMSIpackage64.Hash)" +Write-Output "File Hash for 64 bit MSI package: $($hashMSIpackage64.Hash)" -$chocoInstallScript = $chocoInstallScript.Replace("%CHOCO_32BIT_CHECKSUM%", "$($hashMSIpackage32.Hash)") $chocoInstallScript = $chocoInstallScript.Replace("%CHOCO_64BIT_CHECKSUM%", "$($hashMSIpackage64.Hash)") Write-Output $chocoInstallScript