diff --git a/Evergreen/Apps/Get-FileZilla.ps1 b/Evergreen/Apps/Get-FileZilla.ps1 index c1cea1b2..0d7da7d0 100644 --- a/Evergreen/Apps/Get-FileZilla.ps1 +++ b/Evergreen/Apps/Get-FileZilla.ps1 @@ -28,10 +28,10 @@ function Get-FileZilla { # Convert the content to an object try { - $Updates = ($Content | ConvertFrom-Csv -Delimiter $res.Get.Update.Delimiter -Header $res.Get.Update.Headers) | ` + $Updates = $Content | ConvertFrom-Csv -Delimiter $res.Get.Update.Delimiter -Header $res.Get.Update.Headers | ` Where-Object { $_.Channel -eq $res.Get.Update.Channel } } - catch [System.Exception] { + catch { throw $_ } diff --git a/Evergreen/Manifests/FileZilla.json b/Evergreen/Manifests/FileZilla.json index 26fccd3a..7e3adc5e 100644 --- a/Evergreen/Manifests/FileZilla.json +++ b/Evergreen/Manifests/FileZilla.json @@ -3,8 +3,8 @@ "Source": "https://filezilla-project.org/", "Get": { "Update": { - "Uri": "https://update.filezilla-project.org/update.php?osarch=64&platform=x86_64-w64-mingw32&version=3.56.1", - "UserAgent": "FileZilla/3.66.1", + "Uri": "https://update.filezilla-project.org/update.php?osarch=64&platform=x86_64-w64-mingw32", + "UserAgent": "FileZilla/3.56.1", "Delimiter": " ", "Headers": [ "Channel", diff --git a/Evergreen/Manifests/MasterPackager.json b/Evergreen/Manifests/MasterPackager.json index 2764dff3..2e01a9d2 100644 --- a/Evergreen/Manifests/MasterPackager.json +++ b/Evergreen/Manifests/MasterPackager.json @@ -7,7 +7,7 @@ }, "Download": { "Uri": { - "Free": "https://www.masterpackager.com/installer/public/standard/masterpackager_#version.0.msi" + "Free": "https://www.masterpackager.com/installer/masterpackager_#version.msi" }, "ReplaceText": { "Version": "#version" diff --git a/Evergreen/Private/Invoke-SystemNetRequest.ps1 b/Evergreen/Private/Invoke-SystemNetRequest.ps1 index 92985d5e..5c468b09 100644 --- a/Evergreen/Private/Invoke-SystemNetRequest.ps1 +++ b/Evergreen/Private/Invoke-SystemNetRequest.ps1 @@ -48,7 +48,7 @@ Function Invoke-SystemNetRequest { Write-Output -InputObject $result } catch [System.Exception] { - Write-Warning -Message "$($MyInvocation.MyCommand): $_, with: $Uri." + Write-Warning -Message "$($MyInvocation.MyCommand): $($_.Exception.Message), with: $Uri." Write-Warning -Message "$($MyInvocation.MyCommand): For troubleshooting steps see: $($script:resourceStrings.Uri.Info)." throw $_ }