glenux-archive/spf13--cobra
1
0
Fork 0
mirror of https://github.com/spf13/cobra synced 2024-09-29 03:16:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

cmd: Refine formatting of included licenses

Browse source
This commit is contained in:
Anthony Fok 2017-07-30 02:35:06 -06:00
parent a1b7d3cc4d
commit 9e024b655b
10 changed files with 22 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
cobra/cmd/add.go
View file

@ -121,8 +121,7 @@ func validateCmdName(source string) string {
func createCmdFile(license License, path, cmdName string) { func createCmdFile(license License, path, cmdName string) {
template := `{{comment .copyright}} template := `{{comment .copyright}}
{{if .license}}// {{if .license}}{{comment .license}}{{end}}
{{comment .license}}{{end}}
package {{.cmdPackage}} package {{.cmdPackage}}

6
cobra/cmd/init.go
View file

@ -107,8 +107,7 @@ func createLicenseFile(license License, path string) {
func createMainFile(project *Project) { func createMainFile(project *Project) {
mainTemplate := `{{ comment .copyright }} mainTemplate := `{{ comment .copyright }}
{{if .license}}// {{if .license}}{{ comment .license }}{{end}}
{{ comment .license }}{{end}}
package main package main
@ -136,8 +135,7 @@ func main() {
func createRootCmdFile(project *Project) { func createRootCmdFile(project *Project) {
template := `{{comment .copyright}} template := `{{comment .copyright}}
{{if .license}}// {{if .license}}{{comment .license}}{{end}}
{{comment .license}}{{end}}
package cmd package cmd

3
cobra/cmd/license_agpl.go
View file

@ -4,8 +4,7 @@ func initAgpl() {
Licenses["agpl"] = License{ Licenses["agpl"] = License{
Name: "GNU Affero General Public License", Name: "GNU Affero General Public License",
PossibleMatches: []string{"agpl", "affero gpl", "gnu agpl"}, PossibleMatches: []string{"agpl", "affero gpl", "gnu agpl"},
Header: `{{.copyright}} Header: `
This program is free software: you can redistribute it and/or modify This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Affero General Public License as published by it under the terms of the GNU Affero General Public License as published by
the Free Software Foundation, either version 3 of the License, or the Free Software Foundation, either version 3 of the License, or

3
cobra/cmd/license_apache_2.go
View file

@ -19,7 +19,8 @@ func initApache2() {
Licenses["apache"] = License{ Licenses["apache"] = License{
Name: "Apache 2.0", Name: "Apache 2.0",
PossibleMatches: []string{"apache", "apache20", "apache 2.0", "apache2.0", "apache-2.0"}, PossibleMatches: []string{"apache", "apache20", "apache 2.0", "apache2.0", "apache-2.0"},
Header: `Licensed under the Apache License, Version 2.0 (the "License"); Header: `
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License. you may not use this file except in compliance with the License.
You may obtain a copy of the License at You may obtain a copy of the License at

3
cobra/cmd/license_bsd_clause_2.go
View file

@ -20,8 +20,7 @@ func initBsdClause2() {
Name: "Simplified BSD License", Name: "Simplified BSD License",
PossibleMatches: []string{"freebsd", "simpbsd", "simple bsd", "2-clause bsd", PossibleMatches: []string{"freebsd", "simpbsd", "simple bsd", "2-clause bsd",
"2 clause bsd", "simplified bsd license"}, "2 clause bsd", "simplified bsd license"},
Header: ` Header: `All rights reserved.
All rights reserved.
Redistribution and use in source and binary forms, with or without Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met: modification, are permitted provided that the following conditions are met:

3
cobra/cmd/license_bsd_clause_3.go
View file

@ -19,8 +19,7 @@ func initBsdClause3() {
Licenses["bsd"] = License{ Licenses["bsd"] = License{
Name: "NewBSD", Name: "NewBSD",
PossibleMatches: []string{"bsd", "newbsd", "3 clause bsd", "3-clause bsd"}, PossibleMatches: []string{"bsd", "newbsd", "3 clause bsd", "3-clause bsd"},
Header: ` Header: `All rights reserved.
All rights reserved.
Redistribution and use in source and binary forms, with or without Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met: modification, are permitted provided that the following conditions are met:

3
cobra/cmd/license_gpl_2.go
View file

@ -19,8 +19,7 @@ func initGpl2() {
Licenses["gpl2"] = License{ Licenses["gpl2"] = License{
Name: "GNU General Public License 2.0", Name: "GNU General Public License 2.0",
PossibleMatches: []string{"gpl2", "gnu gpl2", "gplv2"}, PossibleMatches: []string{"gpl2", "gnu gpl2", "gplv2"},
Header: `{{.copyright}} Header: `
This program is free software; you can redistribute it and/or This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License modify it under the terms of the GNU General Public License
as published by the Free Software Foundation; either version 2 as published by the Free Software Foundation; either version 2

3
cobra/cmd/license_gpl_3.go
View file

@ -19,8 +19,7 @@ func initGpl3() {
Licenses["gpl3"] = License{ Licenses["gpl3"] = License{
Name: "GNU General Public License 3.0", Name: "GNU General Public License 3.0",
PossibleMatches: []string{"gpl3", "gplv3", "gpl", "gnu gpl3", "gnu gpl"}, PossibleMatches: []string{"gpl3", "gplv3", "gpl", "gnu gpl3", "gnu gpl"},
Header: `{{.copyright}} Header: `
This program is free software: you can redistribute it and/or modify This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or the Free Software Foundation, either version 3 of the License, or

3
cobra/cmd/license_lgpl.go
View file

@ -4,8 +4,7 @@ func initLgpl() {
Licenses["lgpl"] = License{ Licenses["lgpl"] = License{
Name: "GNU Lesser General Public License", Name: "GNU Lesser General Public License",
PossibleMatches: []string{"lgpl", "lesser gpl", "gnu lgpl"}, PossibleMatches: []string{"lgpl", "lesser gpl", "gnu lgpl"},
Header: `{{.copyright}} Header: `
This program is free software: you can redistribute it and/or modify This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published by it under the terms of the GNU Lesser General Public License as published by
the Free Software Foundation, either version 3 of the License, or the Free Software Foundation, either version 3 of the License, or

2
cobra/cmd/license_mit.go
View file

@ -17,7 +17,7 @@ package cmd
func initMit() { func initMit() {
Licenses["mit"] = License{ Licenses["mit"] = License{
Name: "Mit", Name: "MIT License",
PossibleMatches: []string{"mit"}, PossibleMatches: []string{"mit"},
Header: ` Header: `
Permission is hereby granted, free of charge, to any person obtaining a copy Permission is hereby granted, free of charge, to any person obtaining a copy