1
0
mirror of https://github.com/github/choosealicense.com synced 2024-12-22 04:40:09 +01:00

Merge branch 'gh-pages' into spdx-license-templates

This commit is contained in:
Ben Balter 2018-10-02 15:22:43 -04:00 committed by GitHub
commit 57f57ad2b6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 2 deletions

View File

@ -7,7 +7,7 @@ description: A very short, BSD-style license, used specifically for PostgreSQL.
how: To use it, say that it is The PostgreSQL License, and then substitute the copyright year and name of the copyright holder into the body of the license. Then put the license into a prominent file ("COPYRIGHT", "LICENSE" or "COPYING" are common names for this file) in your software distribution. how: To use it, say that it is The PostgreSQL License, and then substitute the copyright year and name of the copyright holder into the body of the license. Then put the license into a prominent file ("COPYRIGHT", "LICENSE" or "COPYING" are common names for this file) in your software distribution.
using: using:
- pgBadger: https://github.com/dalibo/pgbadger/blob/master/LICENSE - pgBadger: https://github.com/darold/pgbadger/blob/master/LICENSE
- pgAdmin: https://github.com/postgres/pgadmin4/blob/master/LICENSE - pgAdmin: https://github.com/postgres/pgadmin4/blob/master/LICENSE
- .NET Access to PostgreSQL: https://github.com/npgsql/npgsql/blob/dev/LICENSE - .NET Access to PostgreSQL: https://github.com/npgsql/npgsql/blob/dev/LICENSE

View File

@ -3,7 +3,7 @@
set -e set -e
echo "bundling installin'" echo "bundling installin'"
gem install bundler --version 1.16.2 gem install bundler
bundle install bundle install
echo echo

View File

@ -106,6 +106,7 @@ def fsf_approved_licenses
licenses = {} licenses = {}
object['licenses'].each_value do |meta| object['licenses'].each_value do |meta|
next unless (meta.include? 'identifiers') && (meta['identifiers'].include? 'spdx') && (meta.include? 'tags') && (meta['tags'].include? 'libre') next unless (meta.include? 'identifiers') && (meta['identifiers'].include? 'spdx') && (meta.include? 'tags') && (meta['tags'].include? 'libre')
meta['identifiers']['spdx'].each do |identifier| meta['identifiers']['spdx'].each do |identifier|
licenses[identifier.downcase] = meta['name'] licenses[identifier.downcase] = meta['name']
end end