Improving createLicenseFile function

Also fixing typo in README example.
This commit is contained in:
Ian Walter 2016-03-31 14:52:16 -04:00 committed by Steve Francia
parent d811f40c6a
commit 9a8186dbb5
2 changed files with 17 additions and 14 deletions

View file

@ -240,7 +240,7 @@ a custom license:
license: license:
header: This file is part of {{ .appName }}. header: This file is part of {{ .appName }}.
text: | text: |
{{ .Copyright }} {{ .copyright }}
This is my license. There are many like it, but this one is mine. This is my license. There are many like it, but this one is mine.
My license is my best friend. It is my life. I must master it as I must My license is my best friend. It is my life. I must master it as I must

View file

@ -88,20 +88,23 @@ func initializePath(path string) {
} }
func createLicenseFile() { func createLicenseFile() {
data := make(map[string]interface{})
// Try to remove the email address, if any
data["copyright"] = strings.Split(copyrightLine(), " <")[0]
data["appName"] = projectName()
// Get license and generate the template from text and data.
lic := getLicense() lic := getLicense()
r, _ := templateToReader(lic.Text, data)
buf := new(bytes.Buffer) // Don't bother writing a LICENSE file if there is no text.
buf.ReadFrom(r) if lic.Text != "" {
if template := buf.String(); template != "" { data := make(map[string]interface{})
err := writeTemplateToFile(ProjectPath(), "LICENSE", template, data)
// Try to remove the email address, if any
data["copyright"] = strings.Split(copyrightLine(), " <")[0]
data["appName"] = projectName()
// Generate license template from text and data.
r, _ := templateToReader(lic.Text, data)
buf := new(bytes.Buffer)
buf.ReadFrom(r)
err := writeTemplateToFile(ProjectPath(), "LICENSE", buf.String(), data)
_ = err _ = err
// if err != nil { // if err != nil {
// er(err) // er(err)