[AU nicotine-plus:3.3.0] fixes

majkinetor · Feb 18, 2024 · 35a72cb · 35a72cb
1 parent 73de3a7
commit 35a72cb
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 17 deletions.
diff --git a/nicotine-plus/legal/VERIFICATION.txt b/nicotine-plus/legal/VERIFICATION.txt
@@ -7,17 +7,15 @@ Package can be verified like this:
 
 1. Go to
 
-   x32: https://github.com/nicotine-plus/nicotine-plus/releases/download/3.2.9/windows-i686-installer.zip
-   x64: https://github.com/nicotine-plus/nicotine-plus/releases/download/3.2.9/windows-x86_64-installer.zip
+   x64: https://github.com/nicotine-plus/nicotine-plus/releases/download/3.3.0/windows-x86_64-installer.zip
 
    to download the installer.
 
 2. You can use one of the following methods to obtain the SHA256 checksum:
    - Use powershell function 'Get-FileHash'
    - Use Chocolatey utility 'checksum.exe'
 
-   checksum32: 23FA31A83084BAD105D36E9C1ECBE34C65336FB42FA9A7777358CF2A2002E74F
-   checksum64: 8D9DBF744FA2BC1ECF2750FC673A12EBA0FA198A493E837894A3C36391FF2E90
+   checksum64: 0C1A045CA78AB1B1313782236A4FC2CD5C6E60A00FB8B6FE45286619AF3BC62F
 
 File 'license.txt' is obtained from:
    https://www.gnu.org/licenses/gpl-3.0-standalone.html
diff --git a/nicotine-plus/nicotine-plus.nuspec b/nicotine-plus/nicotine-plus.nuspec
@@ -5,7 +5,7 @@
     <!-- Read this before publishing packages to chocolatey.org: https://github.com/chocolatey/chocolatey/wiki/CreatePackages -->
     <id>nicotine-plus</id>
     <title>Nicotine+</title>
-    <version>3.2.9</version>
+    <version>3.3.0</version>
     <authors>Nicotine+ Team</authors>
     <owners>Miodrag Milic</owners>
     <summary>Nicotine+ is a graphical client for the Soulseek peer-to-peer network</summary>
@@ -28,7 +28,7 @@ Nicotine+ uses GTK for its graphical user interface, and is written in Python.
     <licenseUrl>https://github.com/nicotine-plus/nicotine-plus/blob/master/COPYING</licenseUrl>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <iconUrl>https://cdn.rawgit.com/majkinetor/chocolatey/master/nicotine-plus/icon.svg</iconUrl>
-    <releaseNotes>https://github.com/nicotine-plus/nicotine-plus/releases/tag/3.2.9</releaseNotes>
+    <releaseNotes>https://github.com/nicotine-plus/nicotine-plus/releases/tag/3.3.0</releaseNotes>
     <bugTrackerUrl>https://github.com/nicotine-plus/nicotine-plus/issues</bugTrackerUrl>
     <projectSourceUrl>https://github.com/nicotine-plus/nicotine-plus</projectSourceUrl>
     <packageSourceUrl>https://github.com/majkinetor/chocolatey/tree/master/nicotine-plus</packageSourceUrl>

diff --git a/nicotine-plus/update.ps1 b/nicotine-plus/update.ps1
@@ -1,4 +1,6 @@
-$releases = 'https://github.com/nicotine-plus/nicotine-plus/releases'
+. $PSScriptRoot\..\_scripts\all.ps1
+
+$GitHubRepositoryUrl = 'https://github.com/nicotine-plus/nicotine-plus'
 
 function global:au_SearchReplace {
    @{
@@ -7,9 +9,7 @@ function global:au_SearchReplace {
         }
 
         ".\legal\VERIFICATION.txt" = @{
-          "(?i)(\s+x32:).*"            = "`${1} $($Latest.URL32)"
           "(?i)(\s+x64:).*"            = "`${1} $($Latest.URL64)"
-          "(?i)(checksum32:).*"        = "`${1} $($Latest.Checksum32)"
           "(?i)(checksum64:).*"        = "`${1} $($Latest.Checksum64)"
         }
     }
@@ -24,17 +24,12 @@ function global:au_BeforeUpdate {
 }
 
 function global:au_GetLatest {
-    $download_page = Invoke-WebRequest -Uri $releases -UseBasicParsing
-    $domain  = $releases -split '(?<=//.+)/' | select -First 1
-
-    $re      = 'windows-.+?installer\.zip$'
-    $url     = $download_page.links | ? href -match $re | select -First 2 -expand href | % { $domain + $_}
-    $version = $url[0] -split '/' | select -Last 1 -Skip 1
+    $url = Get-GitHubReleaseUrl $GitHubRepositoryUrl 'windows-.+?installer\.zip$'
+    $version = $url -split '/' | select -Last 1 -Skip 1
 
     @{
         Version      = $version
-        URL32        = $url -match 'i686'    | select -First 1
-        URL64        = $url -notmatch 'i686' | select -First 1
+        URL64        = $url
         ReleaseNotes = "https://github.com/nicotine-plus/nicotine-plus/releases/tag/$version"
     }
 }