From d4927815a510a867bb5d674fc0e38bf1b3ac1e88 Mon Sep 17 00:00:00 2001 From: David Yun Date: Thu, 6 Oct 2016 22:23:37 +0800 Subject: [PATCH] Remove license from all documentation --- .../cask_language_reference/all_stanzas.md | 1 - .../doc/cask_language_reference/readme.md | 3 -- .../stanzas/license.md | 47 ------------------- .../cask/doc/development/adding_a_cask.md | 5 -- Library/Homebrew/cask/lib/hbc/cli/create.rb | 1 - 5 files changed, 57 deletions(-) delete mode 100644 Library/Homebrew/cask/doc/cask_language_reference/stanzas/license.md diff --git a/Library/Homebrew/cask/doc/cask_language_reference/all_stanzas.md b/Library/Homebrew/cask/doc/cask_language_reference/all_stanzas.md index 63930b8bfb..b25f864e60 100644 --- a/Library/Homebrew/cask/doc/cask_language_reference/all_stanzas.md +++ b/Library/Homebrew/cask/doc/cask_language_reference/all_stanzas.md @@ -11,7 +11,6 @@ Each of the following stanzas is required for every Cask. | `url` | no | URL to the `.dmg`/`.zip`/`.tgz`/`.tbz2` file that contains the application.
A [comment](stanzas/url.md#when-url-and-homepage-hostnames-differ-add-a-comment) should be added if the hostnames in the `url` and `homepage` stanzas differ. Block syntax should be used for URLs that change on every visit.
See [URL Stanza Details](stanzas/url.md) for more information. | `name` | yes | a string providing the full and proper name defined by the vendor (see also [Name Stanza Details](stanzas/name.md)) | `homepage` | no | application homepage; used for the `brew cask home` command -| `license` | no | a symbol identifying the license category for the application (see also [License Stanza Details](stanzas/license.md)) ## At Least One Artifact Stanza Is Also Required diff --git a/Library/Homebrew/cask/doc/cask_language_reference/readme.md b/Library/Homebrew/cask/doc/cask_language_reference/readme.md index 1fcff78537..e83539cd4c 100644 --- a/Library/Homebrew/cask/doc/cask_language_reference/readme.md +++ b/Library/Homebrew/cask/doc/cask_language_reference/readme.md @@ -12,7 +12,6 @@ cask 'alfred' do url "https://cachefly.alfredapp.com/Alfred_#{version}.zip" name 'Alfred' homepage 'https://www.alfredapp.com/' - license :freemium app 'Alfred 2.app' app 'Alfred 2.app/Contents/Preferences/Alfred Preferences.app' @@ -88,7 +87,6 @@ cask 'myapp' do name 'MyApp' version '1.0' sha256 'a32565cdb1673f4071593d4cc9e1c26bc884218b62fef8abc450daa47ba8fa92' - license :unknown url "https://#{Utils.arbitrary_method}" homepage 'https://www.example.com/' @@ -129,7 +127,6 @@ appcast, checkpoint: # shown here as it is required with `appcast` name homepage -license gpg, key_id: # on same line, since first part is typically small auto_updates diff --git a/Library/Homebrew/cask/doc/cask_language_reference/stanzas/license.md b/Library/Homebrew/cask/doc/cask_language_reference/stanzas/license.md deleted file mode 100644 index 9739c3bdce..0000000000 --- a/Library/Homebrew/cask/doc/cask_language_reference/stanzas/license.md +++ /dev/null @@ -1,47 +0,0 @@ -# license - -The `license` stanza is not free-form. A single value must be chosen from a list of valid symbols. - -The values for `license` are categories, rather than fully-specified licenses. For example, `:gpl` is a category; we do not distinguish between versions of the GPL. Similarly, `:cc` and `:bsd` comprise many variants. They must always pertain to the license of the software itself, not the vendor’s business model (a free app to access a paid service is still `:gratis`, not `:freemium`). - -The `license` stanza is intended as an aid to search/filtering of Casks. For full and complete information, the user must always rely on the vendor’s homepage. - -Note that `brew cask search` and `brew cask list` are not yet capable of using the information stored in the `license` stanza. - -## Generic Category Licenses - -Cask authors should use the most specific license category which is also correct. Generic categories are provided for difficult cases. `:unknown` is also perfectly fine if you are unsure. - -Example: [Chromium](https://www.chromium.org/chromium-os/licenses) includes code with multiple licenses, all of which are open source. Chromium licensing is described by the generic category [`:oss`](https://github.com/caskroom/homebrew-cask/blob/54a79f7dcceea9a922a5b608ac99466b9d10a191/Casks/chromium.rb#L7). - -| symbol | meaning | -| ----------- | ----------- | -| `:oss` | open-source software -| `:closed` | closed-source software -| `:unknown` | license unknown -| `:other` | license is known, but fits no category - -## Valid Licenses - -| symbol | generic category | meaning | URL | -| ---------------- | ---------------- | ------------------------------------------------------------------ | ----------- | -| `:gratis` | `:closed` | free-to-use, closed source | -| `:commercial` | `:closed` | not free to use | -| `:freemium` | `:closed` | free-to-use, payment required for full or additional functionality | -| `:affero` | `:oss` | Affero General Public License | -| `:apache` | `:oss` | Apache Public License | -| `:arphic` | `:oss` | Arphic Public License | -| `:artistic` | `:oss` | Artistic License | -| `:bsd` | `:oss` | BSD License | -| `:cc` | `:oss` | Creative Commons License | -| `:eclipse` | `:oss` | Eclipse Public License | -| `:gpl` | `:oss` | GNU Public License | -| `:isc` | `:oss` | Internet Systems Consortium License | -| `:lppl` | `:oss` | LaTeX Project Public License | -| `:ncsa` | `:oss` | University of Illinois/NCSA Open Source License | -| `:mit` | `:oss` | MIT License | -| `:mpl` | `:oss` | Mozilla Public License | -| `:ofl` | `:oss` | SIL Open Font License | -| `:public_domain` | `:oss` | not copyrighted | -| `:ubuntu_font` | `:oss` | Ubuntu Font License | -| `:x11` | `:oss` | X Consortium License | diff --git a/Library/Homebrew/cask/doc/development/adding_a_cask.md b/Library/Homebrew/cask/doc/development/adding_a_cask.md index d69966a2a3..f4e29415ab 100644 --- a/Library/Homebrew/cask/doc/development/adding_a_cask.md +++ b/Library/Homebrew/cask/doc/development/adding_a_cask.md @@ -17,7 +17,6 @@ cask 'shuttle' do checkpoint: 'c3dea2ed479b3ebba7c56ace6040901795f6dc6be92f9ffc30cc808d31723f17' name 'Shuttle' homepage 'https://fitztrev.github.io/shuttle/' - license :mit app 'Shuttle.app' @@ -36,7 +35,6 @@ cask 'airstream' do url 'https://s3-us-west-2.amazonaws.com/airstream-clients/mac/airstream-mac.dmg' name 'AirStream' homepage 'http://airstream.io/download/' - license :gratis app 'AirStream.app' @@ -58,7 +56,6 @@ cask 'airdisplay' do checkpoint: '938bdb9fbee793dce92818366cb2c19ba84c5b0cd6853fd893897d4a40689bc2' name 'Air Display' homepage 'https://avatron.com/apps/air-display/' - license :commercial pkg 'Air Display Installer.pkg' @@ -102,7 +99,6 @@ cask 'my-new-cask' do url '' name '' homepage '' - license :unknown # TODO: change license and remove this comment; ':unknown' is a machine-generated placeholder app '' end @@ -119,7 +115,6 @@ Fill in the following stanzas for your Cask: | `url` | URL to the `.dmg`/`.zip`/`.tgz`/`.tbz2` file that contains the application.
A [comment](../cask_language_reference/stanzas/url.md#when-url-and-homepage-hostnames-differ-add-a-comment) should be added if the hostnames in the `url` and `homepage` stanzas differ. Block syntax should be used for URLs that change on every visit.
See [URL Stanza Details](../cask_language_reference/stanzas/url.md) for more information. | `name` | the full and proper name defined by the vendor, and any useful alternate names (see [Name Stanza Details](../cask_language_reference/stanzas/name.md)) | `homepage` | application homepage; used for the `brew cask home` command -| `license` | a symbol identifying the license for the application. Valid category licenses include `:oss`, `:closed`, and `:unknown`. It is OK to leave as `:unknown`. (see [License Stanza Details](../cask_language_reference/stanzas/license.md)) | `app` | relative path to an `.app` bundle that should be moved into the `/Applications` folder on installation (see [App Stanza Details](../cask_language_reference/stanzas/app.md)) Other commonly-used stanzas are: diff --git a/Library/Homebrew/cask/lib/hbc/cli/create.rb b/Library/Homebrew/cask/lib/hbc/cli/create.rb index 14860942f7..84537cdc13 100644 --- a/Library/Homebrew/cask/lib/hbc/cli/create.rb +++ b/Library/Homebrew/cask/lib/hbc/cli/create.rb @@ -26,7 +26,6 @@ module Hbc url 'https://' name '' homepage '' - license :unknown # TODO: change license and remove this comment; ':unknown' is a machine-generated placeholder app '' end