Fix licenses and newlines

.seed-config.yaml

@@ -7,7 +7,7 @@ project:
   description: |
     Start with the base layer necessary to focus on your project and not on the repository.  
     Licensing, structure, documentation and more boilerplate to get you started from your first commit.
-  version: "v0.4.2"
+  version: "v0.4.3"
 
 vision:
   type: "community"
@@ -82,18 +82,18 @@ maintainers:
     nick: "stp-ip"
 
 repo:
-  link: "https://github.com/okkur/reposeed"
+  link: "https://git.okkur.org/reposeed"
   type: "Github"
 
 badges:
   - image: "https://img.shields.io/badge/state-beta-blue.svg"
     alt: "state"
   - image: "https://img.shields.io/github/release/okkur/reposeed.svg"
-    link: "https://github.com/okkur/reposeed/releases"
+    link: "https://reposeed.okkur.org/releases"
     alt: "release"
   - image: "https://img.shields.io/github/license/okkur/reposeed.svg"
     link: "LICENSE"
     alt: "license"
 
 reposeed:
-  configVersion: "v1"
+  configVersion: "v1"

.travis.yml

@@ -1,7 +1,7 @@
 language: go
 
 go:
-  - "1.12.x"
+  - "1.13.x"
   - master
 
 before_install:

CHANGELOG.md

@@ -15,6 +15,25 @@ _2018_
 ---
 
 -->
+# v0.4.2
+_2019-10-16_
+  - [Downloads for v0.4.3](https://github.com/okkur/reposeed/releases/tag/v0.4.3)
+  - [Changelog since v0.4.2](#changes-since-v042)
+  - [Documentation for v0.4.3](#documentation-for-v043)
+
+## Documentation for v0.4.3
+[Documentation](/docs)
+
+## Changes since v0.1.0
+  - Docs license choice considered for header example
+  - Add changelog
+
+## Fixes since v0.1.0
+  - New lines
+  - MIT within readme footer #64
+  - MainLicense used within readme
+
+---
 
 # v0.4.2
 _2019-09-06_
@@ -28,7 +47,7 @@ _2019-09-06_
 ## Changes since v0.4.1
   - Use vanity url
 
-## Fixes since v0.4.0
+## Fixes since v0.4.1
 
 ---
 

VERSION

@@ -1 +1 @@
-v0.4.2
+v0.4.3

templates/LICENSE

@@ -1,19 +1,19 @@
 {{- if eq .Project.MainLicense "AGPLv3" -}}
-  {{template "license-partials/AGPLv3" .}}
+  {{ template "license-partials/AGPLv3" . }}
 {{- else if eq .Project.MainLicense "GPLv3" -}}
-  {{template "license-partials/GPLv3" .}}
+  {{ template "license-partials/GPLv3" . }}
 {{- else if eq .Project.MainLicense "MIT" -}}
-  {{template "license-partials/MIT" .}}
+  {{ template "license-partials/MIT" .}}
 {{- else if eq .Project.MainLicense "CC0" -}}
-  {{template "license-partials/creativeCommons0" .}}
+  {{ template "license-partials/creativeCommons0" . }}
 {{- else if eq .Project.MainLicense "CCByNc" -}}
-  {{template "license-partials/creativeCommonsByNc" .}}
+  {{ template "license-partials/creativeCommonsByNc" . }}
 {{- else if eq .Project.MainLicense "CCBy" -}}
-  {{template "license-partials/creativeCommonsBy" .}}
+  {{ template "license-partials/creativeCommonsBy" . }}
 {{- else if eq .Project.MainLicense "CCByNcSa" -}}
-  {{template "license-partials/creativeCommonsByNcSa" .}}
+  {{ template "license-partials/creativeCommonsByNcSa" . }}
 {{- else if eq .Project.MainLicense "CCBySa" -}}
-  {{template "license-partials/creativeCommonsBySa" .}}
+  {{ template "license-partials/creativeCommonsBySa" . }}
 {{- else -}}
-  {{template "license-partials/ApacheV2" .}}
+  {{ template "license-partials/ApacheV2" . }}
 {{- end }}

templates/OWNERS

@@ -1,4 +1,4 @@
-# Current Owners/Maintainers.
+# Current Maintainers
 {{ range .Maintainers -}}
   {{ .Name }} ({{ .Nick }})
 {{ end -}}

templates/README.md

@@ -11,7 +11,9 @@
 {{ .Project.OneLiner }}
 
 {{ range .Badges }}
-  {{- printf " [![%s](%s)](%s)" .Alt .Image .Link -}}
+  {{ if .Image && .Link }}
+    {{- printf " [![%s](%s)](%s)" .Alt .Image .Link -}}
+  {{ end }}
 {{ end }}
 
 {{ "" }}
@@ -47,29 +49,27 @@ Best place to start is our [contribution guide](/CONTRIBUTING.md).
 
 ----
 
-{{ if eq .Project.MainLicense "CCBy" }}
-  {{- printf "*Code is licensed under the [%s](/LICENSE).*  " (print "Creative Commons BY 4.0") }}
-{{ else if eq .Project.MainLicense "CCSa" }}
-  {{- printf "*Code is licensed under the [%s](/LICENSE).*  " (print "Creative Commons SA 4.0") }}
-{{ else if eq .Project.MainLicense "CCBySa" }}
-  {{- printf "*Code is licensed under the [%s](/LICENSE).*  " (print "Creative Commons BY-SA 4.0") }}
-{{ else if eq .Project.MainLicense "CCByNcSa" }}
-  {{- printf "*Code is licensed under the [%s](/LICENSE).*  " (print "Creative Commons BY-NC-SA 4.0") }}
-{{ else if eq .Project.MainLicense "CC0" }}
-  {{- printf "*Code is licensed under the [%s](/LICENSE).*  " (print "Creative Commons CC0 1.0") }}
-{{ else }}
+{{- if eq .Project.MainLicense "AGPLv3" -}}
+  {{- printf "*Code is licensed under the [%s](/LICENSE).*  " (print "AGPL License, Version 3.0") }}
+{{- else if eq .Project.MainLicense "GPLv3" -}}
+  {{- printf "*Code is licensed under the [%s](/LICENSE).*  " (print "GPL License, Version 3.0") }}
+{{- else if eq .Project.MainLicense "BSD3" -}}
+  {{- printf "*Code is licensed under the [%s](/LICENSE).*  " (print "BSD License, Version 3.0") }}
+{{- else if eq .Project.MainLicense "MIT" -}}
+  {{- printf "*Code is licensed under the [%s](/LICENSE).*  " (print "MIT License") }}
+{{- else -}}
   {{- printf "*Code is licensed under the [%s](/LICENSE).*  " (print "Apache License, Version 2.0") }}
-{{ end -}}
+{{- end }}
 
 {{ if eq .Project.DocsLicense "apache2" }}
   {{- printf "*Documentation/examples are licensed under [%s](/docs/LICENSE).*  " (print "Apache License, Version 2.0") }}
-{{ else if eq .Project.MainLicense "CCBy" }}
+{{ else if eq .Project.DocsLicense "CCBy" }}
   {{- printf "*Documentation/examples are licensed under [%s](/docs/LICENSE).*  " (print "Creative Commons BY 4.0") }}
-{{ else if eq .Project.MainLicense "CCSa" }}
+{{ else if eq .Project.DocsLicense "CCSa" }}
   {{- printf "*Documentation/examples are licensed under [%s](/docs/LICENSE).*  " (print "Creative Commons SA 4.0") }}
-{{ else if eq .Project.MainLicense "CCByNcSa" }}
+{{ else if eq .Project.DocsLicense "CCByNcSa" }}
   {{- printf "*Documentation/examples are licensed under [%s](/docs/LICENSE).*  " (print "Creative Commons BY-NC-SA 4.0") }}
-{{ else if eq .Project.MainLicense "CC0" }}
+{{ else if eq .Project.DocsLicense "CC0" }}
   {{- printf "*Documentation/examples are licensed under [%s](/docs/LICENSE).*  " (print "Creative Commons CC0 1.0") }}
 {{ else }}
   {{- printf "*Documentation/examples are licensed under [%s](/docs/LICENSE).*  " (print "Creative Commons BY-SA 4.0") }}

templates/SUPPORT.md

@@ -37,10 +37,13 @@ The {{ .Project.Name }} community might be active on various platforms.
 {{- end -}}
 
 {{ "" }}
+{{ if .SupportLinks }}
 ## Documentation
 {{- with .SupportLinks.Documentation }}
   {{ printf "* [User Documentation](%s)" . }}
 {{ end -}}
 {{- with .SupportLinks.Troubleshooting }}
   {{ printf "* [Troubleshooting Guide](%s)" . }}
 {{ end -}}
+
+{{- end }}

templates/seed-config.example.yaml

@@ -85,4 +85,4 @@ badges:
     alt: "license"
 
 reposeed:
-  configVersion: "v1"
+  configVersion: "v1"