Skip to content
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.

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

Fix license attributes to SPDX standard #2377

Merged
merged 2 commits into from
Jul 11, 2018

Conversation

rasa
Copy link
Member

@rasa rasa commented Jul 9, 2018

Final (?) attempt. I had to change errant *-or-laters to *-onlys.

@rasa
Copy link
Member Author

rasa commented Jul 9, 2018

@r15ch13
Copy link
Member

r15ch13 commented Jul 10, 2018

Which license separator do you want to use?
7zip.json uses , and artifact.json uses |
This should be consistent, so scoop info can display the licenses correctly (changes to this are currently missing)

@rasa
Copy link
Member Author

rasa commented Jul 10, 2018

I documented it here:
license: The software license for the program. For well-known licenses, please use the identifier found at https://spdx.org/licenses/ For other licenses, use the URL of the license, if available. Otherwise, use “Freeware”, “Proprietary”, “Public Domain”, or “Shareware”, as appropriate. If multiple licenses, seperate licenses with a comma (,). If dual licensed, seperate licenses with a pipe symbol (|).

I updated the docs for the new schema elements identifier and url.

@r15ch13
Copy link
Member

r15ch13 commented Jul 10, 2018

Oh, okay. I missed that 😁

@rasa rasa merged commit 15e3c25 into ScoopInstaller:master Jul 11, 2018
@rasa rasa deleted the rasa/fix-licenses-v2 branch July 11, 2018 02:02
@chawyehsu
Copy link
Member

So is it a backward compatibility update? What about user-defined buckets? And is there any tool/script can merge this change, for 3rd-party buckets?

@rasa
Copy link
Member Author

rasa commented Jul 11, 2018

It’s backwards compatible, so nothing will break. The license property can remain a string of any value.

@chawyehsu
Copy link
Member

chawyehsu commented Jul 11, 2018

Ok, well done. It looks like the scoop info sub-command should also be enhanced to handle with the new license property.

@rasa
Copy link
Member Author

rasa commented Jul 11, 2018

@h404bi Great idea, I added it as #2380

Ash258 added a commit to Ash258/Shovel-Ash258 that referenced this pull request Jul 16, 2018
1. [x] Wait for <ScoopInstaller/Scoop#2377> merge (Licence)
1. [x] Edit all script into array
1. [x] Check all comments, notes
    - [x] Make them array
1. [x] Edit licences
1. [x] Add app name to start of each app description
1. [x] Squash merge
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants