Merge branch 'develop' into dev

ScoopInstaller · Oct 10, 2023 · 299ba9c · 299ba9c
2 parents f85824b + 2847e0a
commit 299ba9c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -36,6 +36,7 @@
 - **scoop-(un)hold:** Correct output the messages when manifest not found, (already|not) held ([#5519](https://github.com/ScoopInstaller/Scoop/issues/5519))
 - **scoop-update:** Change error message to a better instruction ([#5677](https://github.com/ScoopInstaller/Scoop/issues/5677))
 - **shim:** Check literal path in `Get-ShimPath` ([#5680](https://github.com/ScoopInstaller/Scoop/issues/5680))
+- **shim:** Avoid unexpected output of `list` subcommand ([#5681](https://github.com/ScoopInstaller/Scoop/issues/5681))
 
 ### Performance Improvements
 

diff --git a/libexec/scoop-shim.ps1 b/libexec/scoop-shim.ps1
@@ -12,7 +12,7 @@
 #
 # To list all shims or matching shims, use the 'list' subcommand:
 #
-#     scoop shim list [<shim_name>/<pattern>...]
+#     scoop shim list [<regex_pattern>...]
 #
 # To show a shim's information, use the 'info' subcommand:
 #
@@ -144,7 +144,7 @@ switch ($SubCommand) {
         $other | ForEach-Object {
             try {
                 $pattern = $_
-                [Regex]::New($pattern)
+                [void][Regex]::New($pattern)
             } catch {
                 Write-Host "ERROR: Invalid pattern: " -ForegroundColor Red -NoNewline
                 Write-Host $pattern -ForegroundColor Magenta