From a1e6789a94c16788f1bb104fd8b38767885c691e Mon Sep 17 00:00:00 2001 From: Shivam Mathur Date: Sun, 25 Dec 2022 21:52:32 +0530 Subject: [PATCH] Improve Get-PhalconReleaseAssetUrl --- src/scripts/extensions/phalcon.ps1 | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/src/scripts/extensions/phalcon.ps1 b/src/scripts/extensions/phalcon.ps1 index a0c1b1611..b50395793 100644 --- a/src/scripts/extensions/phalcon.ps1 +++ b/src/scripts/extensions/phalcon.ps1 @@ -8,17 +8,20 @@ Function Get-PhalconReleaseAssetUrl() { ) $domain = 'https://api.github.com/repos' $releases = 'phalcon/cphalcon/releases' - $nts = if (!$installed.ThreadSafe) { "_nts" } else { "" } - $match = $match = (Invoke-RestMethod -Uri "$domain/$releases/tags/v$Semver").assets | Select-String -Pattern "browser_download_url=.*(phalcon_${arch}_.*_php${version}_${extension_version}.*[0-9]${nts}.zip)" - if($NULL -eq $match) { - $match = (Invoke-WebRequest -Uri "$github/$releases/expanded_assets/v$Semver").Links.href | Select-String -Pattern "(phalcon_${arch}_.*_php${version}_${extension_version}.*[0-9]${nts}.zip)" - } - if($NULL -eq $match) { + if($extension_version -match '[3-4]') { + $nts = if (!$installed.ThreadSafe) { "_nts" } else { "" } + try { + $match = (Invoke-RestMethod -Uri "$domain/$releases/tags/v$Semver").assets | Select-String -Pattern "browser_download_url=.*(phalcon_${arch}_.*_php${version}_${extension_version}.*[0-9]${nts}.zip)" + } catch { + $match = (Invoke-WebRequest -Uri "$github/$releases/expanded_assets/v$Semver").Links.href | Select-String -Pattern "(phalcon_${arch}_.*_php${version}_${extension_version}.*[0-9]${nts}.zip)" + } + } else { $nts = if (!$installed.ThreadSafe) { "-nts" } else { "-ts" } - $match = (Invoke-RestMethod -Uri "$domain/$releases/tags/v$Semver").assets | Select-String -Pattern "browser_download_url=.*(phalcon-php${version}${nts}-windows.*-x64.zip)" - } - if($NULL -eq $match) { - $match = (Invoke-WebRequest -Uri "$github/$releases/expanded_assets/v$Semver").Links.href | Select-String -Pattern "(phalcon-php${version}${nts}-windows.*-x64.zip)" + try { + $match = (Invoke-RestMethod -Uri "$domain/$releases/tags/v$Semver").assets | Select-String -Pattern "browser_download_url=.*(phalcon-php${version}${nts}-windows.*-x64.zip)" + } catch { + $match = (Invoke-WebRequest -Uri "$github/$releases/expanded_assets/v$Semver").Links.href | Select-String -Pattern "(phalcon-php${version}${nts}-windows.*-x64.zip)" + } } if($NULL -ne $match) { return "$github/$releases/download/v$Semver/$($match.Matches[0].Groups[1].Value)"