(zabbix-agent) fix zabbix-agent (#210)

mkevenaar · Oct 18, 2023 · 8ade3d7 · 8ade3d7
1 parent e25f744
commit 8ade3d7
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 7 deletions.
diff --git a/automatic/zabbix-agent.install/update.ps1 b/automatic/zabbix-agent.install/update.ps1
@@ -45,7 +45,8 @@ function global:au_GetLatest {
     try {
       $majVersionFolder = $_.href
       $version_download_page = Invoke-WebRequest -UseBasicParsing -Uri "$releases$majVersionFolder"
-      $version = $version_download_page.Links | Select-Object -ExpandProperty href | ForEach-Object{ Get-Version ($_) -ErrorAction SilentlyContinue } | Sort-Object | Select-Object -Last 1
+      $majVersion = Get-Version $majVersionFolder
+      $version = $version_download_page.Links | Where-Object -Property href -Match $majVersion|  Select-Object -ExpandProperty href | ForEach-Object{ Get-Version ($_) } | Sort-Object | Select-Object -Last 1
 
       $url32Bit = "${releases}${majVersionFolder}${version}/zabbix_agent-${version}-windows-i386-openssl.msi"
       $url64Bit = "${releases}${majVersionFolder}${version}/zabbix_agent-${version}-windows-amd64-openssl.msi"

diff --git a/automatic/zabbix-agent/update.ps1 b/automatic/zabbix-agent/update.ps1
@@ -5,7 +5,7 @@ $releases = 'https://cdn.zabbix.com/zabbix/binaries/stable/'
 function global:au_SearchReplace {
   @{
     ".\tools\chocolateyInstall.ps1" = @{
-      "(?i)(version\s*=\s*)('.*')"        = "`$1'$($Latest.Version)'"
+      "(?i)(version\s*=\s*)('.*')"        = "`$1'$($Latest.ChocoVersion)'"
       "(?i)(^\s*file\s*=\s*`"[$]toolsDir\\).*" = "`${1}$($Latest.FileName32)`""
       "(?i)(^\s*file64\s*=\s*`"[$]toolsDir\\).*" = "`${1}$($Latest.FileName64)`""
     }
@@ -27,9 +27,10 @@ function CreateStream {
   param($url32bit, $url64bit, $version)
 
   $Result = @{
-    Version = $version
-    URL32   = $url32bit
-    URL64   = $url64bit
+    ChocoVersion = $version
+    Version      = $version
+    URL32        = $url32bit
+    URL64        = $url64bit
   }
 
   return $Result
@@ -46,7 +47,8 @@ function global:au_GetLatest {
     try {
       $majVersionFolder = $_.href
       $version_download_page = Invoke-WebRequest -UseBasicParsing -Uri "$releases$majVersionFolder"
-      $version = $version_download_page.Links | Select-Object -ExpandProperty href | ForEach-Object{ Get-Version ($_) -ErrorAction SilentlyContinue } | Sort-Object | Select-Object -Last 1
+      $majVersion = Get-Version $majVersionFolder
+      $version = $version_download_page.Links | Where-Object -Property href -Match $majVersion|  Select-Object -ExpandProperty href | ForEach-Object{ Get-Version ($_) } | Sort-Object | Select-Object -Last 1
 
       $url32Bit = "${releases}${majVersionFolder}${version}/zabbix_agent-${version}-windows-i386-openssl.zip"
       $url64Bit = "${releases}${majVersionFolder}${version}/zabbix_agent-${version}-windows-amd64-openssl.zip"

diff --git a/automatic/zabbix-agent2/update.ps1 b/automatic/zabbix-agent2/update.ps1
@@ -45,7 +45,8 @@ function global:au_GetLatest {
     try {
       $majVersionFolder = $_.href
       $version_download_page = Invoke-WebRequest -UseBasicParsing -Uri "$releases$majVersionFolder"
-      $version = $version_download_page.Links | Select-Object -ExpandProperty href | ForEach-Object{ Get-Version ($_) -ErrorAction SilentlyContinue } | Sort-Object | Select-Object -Last 1
+      $majVersion = Get-Version $majVersionFolder
+      $version = $version_download_page.Links | Where-Object -Property href -Match $majVersion|  Select-Object -ExpandProperty href | ForEach-Object{ Get-Version ($_) } | Sort-Object | Select-Object -Last 1
 
       $url32Bit = "${releases}${majVersionFolder}${version}/zabbix_agent2-${version}-windows-i386-openssl.msi"
       $url64Bit = "${releases}${majVersionFolder}${version}/zabbix_agent2-${version}-windows-amd64-openssl.msi"