Skip to content

refactor(scoop-info): resolve the license identifier before matching #6770

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
abgox wants to merge 4 commits into
base: develop
Choose a base branch
from
Open

refactor(scoop-info): resolve the license identifier before matching #6770

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0ce2eff
refactor(scoop-info): resolve the license identifier before matching
abgox Oct 6, 2026
59e96e7
docs(chglog): Add missing entry
abgox Oct 6, 2026
26dc28f
fix(scoop-info): Trim whitespace when splitting multiple licenses
abgox Oct 6, 2026
615b89d
fix(scoop-info): Prefer the manifest URL over generated SPDX links
abgox Oct 6, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@

- **workflow:** Drop the `v` prefix from the release title ([#6761](https://github.com/ScoopInstaller/Scoop/issues/6761))

### Code Refactoring

- **scoop-info:** Resolve the license identifier before URL and separator matching ([#6770](https://github.com/ScoopInstaller/Scoop/issues/6770))

## [v0.6.0](https://github.com/ScoopInstaller/Scoop/compare/v0.5.3...v0.6.0) - 2026-09-30

### Features
Expand Down
20 changes: 9 additions & 11 deletions libexec/scoop-info.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,19 +101,17 @@ if ($manifest.homepage) {
}
# Show license
if ($manifest.license) {
$item.License = if ($manifest.license.identifier -and $manifest.license.url) {
if ($verbose) { "$($manifest.license.identifier) ($($manifest.license.url))" } else { $manifest.license.identifier }
} elseif ($manifest.license -match '^((ht)|f)tps?://') {
$manifest.license
} elseif ($manifest.license -match '[|,]') {
if ($verbose) {
"$($manifest.license) ($(($manifest.license -Split '\||,' | ForEach-Object { "https://spdx.org/licenses/$_.html" }) -join ', '))"
} else {
$manifest.license
}
$identifier = if ($manifest.license.identifier) { $manifest.license.identifier } else { $manifest.license }
$url = if ($manifest.license.url) {
$manifest.license.url
} elseif ($identifier -match '^((ht)|f)tps?://') {
$null
} elseif ($identifier -match '[|,]') {
(($identifier -Split '\||,' | ForEach-Object { "https://spdx.org/licenses/$($_.Trim()).html" }) -join ', ')
Comment thread
coderabbitai[bot] marked this conversation as resolved.
} else {
if ($verbose) { "$($manifest.license) (https://spdx.org/licenses/$($manifest.license).html)" } else { $manifest.license }
"https://spdx.org/licenses/$identifier.html"
}
$item.License = if ($verbose -and $url) { "$identifier ($url)" } else { $identifier }
}

if ($manifest.depends) {
Expand Down