Merge from ScoopInstaller/develop (#4527), 2021/11/22

README.md

@@ -105,9 +105,12 @@ Scoop can utilize [`aria2`](https://github.com/aria2/aria2) to use multi-connect
 scoop install aria2
 ```
 
+By default, `scoop` displays a warning when running `scoop install` or `scoop update` while `aria2` is enabled. This warning can be suppressed by running `scoop config aria2-warning-enabled false`.
+
 You can tweak the following `aria2` settings with the `scoop config` command:
 
 - aria2-enabled (default: true)
+- aria2-warning-enabled (default: true)
 - [aria2-retry-wait](https://aria2.github.io/manual/en/html/aria2c.html#cmdoption-retry-wait) (default: 2)
 - [aria2-split](https://aria2.github.io/manual/en/html/aria2c.html#cmdoption-s) (default: 5)
 - [aria2-max-connection-per-server](https://aria2.github.io/manual/en/html/aria2c.html#cmdoption-x) (default: 5)

appveyor.yml

@@ -12,6 +12,7 @@ environment:
   scoop_helpers: C:\projects\helpers
   lessmsi: '%scoop_helpers%\lessmsi\lessmsi.exe'
   innounp: '%scoop_helpers%\innounp\innounp.exe'
+  zstd: '%scoop_helpers%\zstd\zstd.exe'
   matrix:
     - PowerShell: 5
     - PowerShell: 6

bin/checkver.ps1

@@ -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) {
@@ -292,7 +292,7 @@ while ($in_progress -gt 0) {
 
     Write-Host $ver -ForegroundColor DarkRed -NoNewline
     Write-Host " (scoop version is $expected_ver)" -NoNewline
-    $update_available = (compare_versions $expected_ver $ver) -eq -1
+    $update_available = (Compare-Version -ReferenceVersion $ver -DifferenceVersion $expected_ver) -ne 0
 
     if ($json.autoupdate -and $update_available) {
         Write-Host ' autoupdate available' -ForegroundColor Cyan
@@ -311,7 +311,7 @@ while ($in_progress -gt 0) {
             if ($Version -ne "") {
                 $ver = $Version
             }
-            autoupdate $App $Dir $json $ver $matchesHashtable
+            Invoke-AutoUpdate $App $Dir $json $ver $matchesHashtable
         } catch {
             error $_.Exception.Message
         }

bin/uninstall.ps1

@@ -34,7 +34,7 @@ $errors = $false
 
 # Uninstall given app
 function do_uninstall($app, $global) {
-    $version = current_version $app $global
+    $version = Select-CurrentVersion -AppName $app -Global:$global
     $dir = versiondir $app $version $global
     $manifest = installed_manifest $app $version $global
     $install = install_info $app $version $global