lee/Scoop
1
0
Fork 0
mirror of https://github.com/ScoopInstaller/Scoop.git synced 2026-09-24 14:25:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

refactor(autoupdate): 'get_version_substitutions' -> 'Get-VersionSubstitution'

Browse Source 
Signed-off-by: Hsiao-nan Cheung <niheaven@gmail.com>
This commit is contained in:
Hsiao-nan Cheung
2020-03-10 13:46:36 +08:00
parent 3279bbfb71
commit 2a91ddb101
2 changed files with 26 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bin/checkver.ps1
+1 -1
View File
@@ -94,7 +94,7 @@ Get-Event | ForEach-Object {
$Queue | ForEach-Object {
$name, $json = $_
$substitutions = get_version_substitutions $json.version
$substitutions = Get-VersionSubstitution $json.version
$wc = New-Object Net.Webclient
if ($json.checkver.useragent) {
lib/autoupdate.ps1
+25 -17
View File
@@ -324,26 +324,34 @@ function update_manifest_prop([String] $prop, $json, [Hashtable] $substitutions)
}
}
function get_version_substitutions([String] $version, [Hashtable] $customMatches) {
$firstPart = $version.Split('-') | Select-Object -first 1
$lastPart = $version.Split('-') | Select-Object -last 1
function Get-VersionSubstitution {
param (
[String]
$Version,
[Hashtable]
$CustomMatches
)
$firstPart = $Version.Split('-') | Select-Object -First 1
$lastPart = $Version.Split('-') | Select-Object -Last 1
$versionVariables = @{
'$version' = $version;
'$underscoreVersion' = ($version -replace "\.", "_");
'$dashVersion' = ($version -replace "\.", "-");
'$cleanVersion' = ($version -replace "\.", "");
'$majorVersion' = $firstPart.Split('.') | Select-Object -first 1;
'$minorVersion' = $firstPart.Split('.') | Select-Object -skip 1 -first 1;
'$patchVersion' = $firstPart.Split('.') | Select-Object -skip 2 -first 1;
'$buildVersion' = $firstPart.Split('.') | Select-Object -skip 3 -first 1;
'$version' = $Version;
'$dotVersion' = ($Version -replace '[._-]', '.');
'$underscoreVersion' = ($Version -replace '[._-]', '_');
'$dashVersion' = ($Version -replace '[._-]', '-');
'$cleanVersion' = ($Version -replace '[._-]', '');
'$majorVersion' = $firstPart.Split('.') | Select-Object -First 1;
'$minorVersion' = $firstPart.Split('.') | Select-Object -Skip 1 -First 1;
'$patchVersion' = $firstPart.Split('.') | Select-Object -Skip 2 -First 1;
'$buildVersion' = $firstPart.Split('.') | Select-Object -Skip 3 -First 1;
'$preReleaseVersion' = $lastPart;
}
if($version -match "(?<head>\d+\.\d+(?:\.\d+)?)(?<tail>.*)") {
$versionVariables.Set_Item('$matchHead', $matches['head'])
$versionVariables.Set_Item('$matchTail', $matches['tail'])
if($Version -match "(?<head>\d+\.\d+(?:\.\d+)?)(?<tail>.*)") {
$versionVariables.Set_Item('$matchHead', $Matches['head'])
$versionVariables.Set_Item('$matchTail', $Matches['tail'])
}
if($customMatches) {
$customMatches.GetEnumerator() | ForEach-Object {
if($CustomMatches) {
$CustomMatches.GetEnumerator() | ForEach-Object {
if($_.Name -ne "0") {
$versionVariables.Set_Item('$match' + (Get-Culture).TextInfo.ToTitleCase($_.Name), $_.Value)
}
@@ -398,7 +406,7 @@ function autoupdate([String] $app, $dir, $json, [String] $version, [Hashtable] $
$has_changes = $false
$has_errors = $false
[Bool]$valid = $true
$substitutions = get_version_substitutions $version $matches
$substitutions = Get-VersionSubstitution $version $matches
if ($json.url) {
if ($json.autoupdate.url -is [System.Array]) {