1
0
mirror of https://github.com/github/choosealicense.com synced 2024-12-22 12:50:24 +01:00

annoyances

This commit is contained in:
Mike Linksvayer 2017-11-20 12:19:13 -08:00
parent 1eb373964e
commit 590422994d
3 changed files with 22 additions and 18 deletions

View File

@ -70,19 +70,19 @@ copy of the Source Code in an information repository reasonably calculated to
permit inexpensive and convenient access by You for as long as Licensor
continues to distribute the Original Work.
4) Exclusions From License Grant. Neither the names of Licensor, nor the
names of any contributors to the Original Work, nor any of their trademarks
or service marks, may be used to endorse or promote products derived from
this Original Work without express prior permission of the Licensor. Except
as expressly stated herein, nothing in this License grants any license to
Licensors trademarks, copyrights, patents, trade secrets or any other
intellectual property. No patent license is granted to make, use, sell, offer
for sale, have made, or import embodiments of any patent claims other than
the licensed claims defined in Section 2. No license is granted to the
trademarks of Licensor even if such marks are included in the Original Work.
Nothing in this License shall be interpreted to prohibit Licensor from
licensing under terms different from this License any Original Work that
Licensor otherwise would have a right to license.
4) Exclusions From License Grant. Neither the names of Licensor, nor the names
of any contributors to the Original Work, nor any of their trademarks or
service marks, may be used to endorse or promote products derived from this
Original Work without express prior permission of the Licensor. Except as
expressly stated herein, nothing in this License grants any license to
Licensors trademarks, copyrights, patents, trade secrets or any other
intellectual property. No patent license is granted to make, use, sell, offer
for sale, have made, or import embodiments of any patent claims other than the
licensed claims defined in Section 2. No license is granted to the trademarks
of Licensor even if such marks are included in the Original Work. Nothing in
this License shall be interpreted to prohibit Licensor from licensing under
terms different from this License any Original Work that Licensor otherwise
would have a right to license.
5) External Deployment. The term "External Deployment" means the use,
distribution, or communication of the Original Work or Derivative Works in any

View File

@ -41,9 +41,9 @@ below) provided that the following conditions are met:
notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution.
* Neither the name of [fullname] nor the names of its contributors may be
used to endorse or promote products derived from this software without
specific prior written permission.
* Neither the name of the copyright holder nor the names of its
contributors may be used to endorse or promote products derived from this
software without specific prior written permission.
NO EXPRESS OR IMPLIED LICENSES TO ANY PARTY'S PATENT RIGHTS ARE GRANTED BY
THIS LICENSE. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND

View File

@ -20,12 +20,16 @@ site.collections['licenses'].docs.each do |license|
license_key = license.data['spdx-id'].downcase
if ['bsd-2-clause', 'bsd-3-clause'].include? license_key
if license_key == 'afl-3.0'
# https://github.com/spdx/license-list/pull/20
spdx_text = spdx_text.gsub(/^ 4\)/, '4)')
elsif ['bsd-2-clause', 'bsd-3-clause'].include? license_key
spdx_text = spdx_text.gsub(/<year>/, '[year]')
spdx_text = spdx_text.gsub(/<owner>/, '[fullname]')
elsif license_key == 'bsd-3-clause-clear'
spdx_text = spdx_text.gsub(/\[xxxx\]-\[xxxx\]/, '[year]')
spdx_text = spdx_text.gsub(/\[Owner Organization\]/, '[fullname]')
spdx_text = spdx_text.sub(/\[Owner Organization\]/, '[fullname]')
spdx_text = spdx_text.sub(/\[Owner Organization\]/, 'the copyright holder')
elsif license_key == 'isc'
spdx_text = spdx_text.gsub(/Copyright.*Consortium/m, 'Copyright (c) [year], [fullname]')
elsif license_key == 'mit'