diff options
| -rw-r--r-- | NEWS.md | 7 | ||||
| -rw-r--r-- | templates/awk/.licensure.yml | 6 | ||||
| -rwxr-xr-x | templates/awk/scripts/renew_copyright_header.sh | 8 | ||||
| -rw-r--r-- | templates/c/.licensure.yml | 6 | ||||
| -rwxr-xr-x | templates/c/scripts/renew_copyright_header.sh | 8 | ||||
| -rw-r--r-- | templates/latex/.licensure.yml | 6 | ||||
| -rwxr-xr-x | templates/latex/scripts/renew_copyright_header.sh | 8 | ||||
| -rw-r--r-- | templates/rust/.licensure.yml | 6 | ||||
| -rwxr-xr-x | templates/rust/scripts/renew_copyright_header.sh | 8 | ||||
| -rw-r--r-- | templates/shell/.licensure.yml | 6 | ||||
| -rwxr-xr-x | templates/shell/scripts/renew_copyright_header.sh | 8 |
11 files changed, 57 insertions, 20 deletions
diff --git a/NEWS.md b/NEWS.md index 522c6f1..20d2458 100644 --- a/NEWS.md +++ b/NEWS.md @@ -2,6 +2,13 @@ All notable changes to this project will be documented in this file. See [conventional commits](https://www.conventionalcommits.org/) for commit guidelines. - - - +## [v0.4.1](https://codeberg.org/soispha/flake-templates/compare/c49ff7634b13908fa0f9f6a2013697d490cb6766..v0.4.1) - 2024-04-01 +#### Bug Fixes +- **(common/.licensure.yml)** Remove one last reference to Trixy - ([c49ff76](https://codeberg.org/soispha/flake-templates/commit/c49ff7634b13908fa0f9f6a2013697d490cb6766)) - [@bpeetz](https://codeberg.org/bpeetz) +- **(common/scripts/renew_copyright_header)** Add support for TeX files - ([c2b2056](https://codeberg.org/soispha/flake-templates/commit/c2b20568121db07fe4ba16703f7c319cd398939a)) - [@bpeetz](https://codeberg.org/bpeetz) + +- - - + ## [v0.4.0](https://codeberg.org/soispha/flake-templates/compare/38f0b95ff7d89d51687018d37de106fabc49fdb6..v0.4.0) - 2024-04-01 #### Build system - **(cog.toml)** Also update files before every new release - ([c7522ce](https://codeberg.org/soispha/flake-templates/commit/c7522ce544db03dfb6366ce1705fb828f6377ed9)) - [@bpeetz](https://codeberg.org/bpeetz) diff --git a/templates/awk/.licensure.yml b/templates/awk/.licensure.yml index b7f963a..80d8f71 100644 --- a/templates/awk/.licensure.yml +++ b/templates/awk/.licensure.yml @@ -21,10 +21,10 @@ licenses: email: "benedikt.peetz@b-peetz.de" template: | - <TODO> 2024 - [year] (C) by [name of author] + TODO 2024 - [year] (C) by [name of author] SPDX-License-Identifier: CC-BY-SA-4.0 - <TODO> is licensed under a + TODO is licensed under a Creative Commons Attribution-ShareAlike 4.0 International License. You should have received a copy of the license along with this @@ -68,7 +68,7 @@ licenses: This file is part of the TODO. - Trixy is free software: you can redistribute it and/or modify + TODO is free software: you can redistribute it and/or modify it under the terms of the Lesser GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/templates/awk/scripts/renew_copyright_header.sh b/templates/awk/scripts/renew_copyright_header.sh index edb0a65..4f424c3 100755 --- a/templates/awk/scripts/renew_copyright_header.sh +++ b/templates/awk/scripts/renew_copyright_header.sh @@ -3,6 +3,7 @@ # NOTE: This is the line length of the .licensure.yml header template **plus** the extra # line after the template comment. TEMPLATE_LINE_LENGTH=20 +LATEX_TEMPLATE_LINE_LENGTH=9 PROJECT_ROOT="$(git rev-parse --show-toplevel)" @@ -17,6 +18,11 @@ remove() { "Makefile" | "toml" | "envrc" | "yml" | "gitignore" | "awk") sed --in-place "1,${TEMPLATE_LINE_LENGTH}d" "$file" ;; + # LaTeX files (or TeX files in general) have a different license, use the + # $LATEX_TEMPLATE_LINE_LENGTH variable. + "tex") + sed --in-place "1,${LATEX_TEMPLATE_LINE_LENGTH}d" "$file" + ;; # normal '/* ... */' like comments (these are $TEMPLATE_LINE_LENGTH + 2 lines long) "c" | "h" | "md" | "rs") length="$((TEMPLATE_LINE_LENGTH + 2))" @@ -66,7 +72,7 @@ if [ -f "$1" ]; then fi else fd --type file --hidden . | while read -r file; do - if grep --quiet 'SPDX-License-Identifier: GPL-3.0-or-later' "$file"; then + if grep --quiet 'SPDX-License-Identifier' "$file"; then filename="$(basename -- "$file")" extension="${filename##*.}" filename="${filename%.*}" diff --git a/templates/c/.licensure.yml b/templates/c/.licensure.yml index b7f963a..80d8f71 100644 --- a/templates/c/.licensure.yml +++ b/templates/c/.licensure.yml @@ -21,10 +21,10 @@ licenses: email: "benedikt.peetz@b-peetz.de" template: | - <TODO> 2024 - [year] (C) by [name of author] + TODO 2024 - [year] (C) by [name of author] SPDX-License-Identifier: CC-BY-SA-4.0 - <TODO> is licensed under a + TODO is licensed under a Creative Commons Attribution-ShareAlike 4.0 International License. You should have received a copy of the license along with this @@ -68,7 +68,7 @@ licenses: This file is part of the TODO. - Trixy is free software: you can redistribute it and/or modify + TODO is free software: you can redistribute it and/or modify it under the terms of the Lesser GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/templates/c/scripts/renew_copyright_header.sh b/templates/c/scripts/renew_copyright_header.sh index edb0a65..4f424c3 100755 --- a/templates/c/scripts/renew_copyright_header.sh +++ b/templates/c/scripts/renew_copyright_header.sh @@ -3,6 +3,7 @@ # NOTE: This is the line length of the .licensure.yml header template **plus** the extra # line after the template comment. TEMPLATE_LINE_LENGTH=20 +LATEX_TEMPLATE_LINE_LENGTH=9 PROJECT_ROOT="$(git rev-parse --show-toplevel)" @@ -17,6 +18,11 @@ remove() { "Makefile" | "toml" | "envrc" | "yml" | "gitignore" | "awk") sed --in-place "1,${TEMPLATE_LINE_LENGTH}d" "$file" ;; + # LaTeX files (or TeX files in general) have a different license, use the + # $LATEX_TEMPLATE_LINE_LENGTH variable. + "tex") + sed --in-place "1,${LATEX_TEMPLATE_LINE_LENGTH}d" "$file" + ;; # normal '/* ... */' like comments (these are $TEMPLATE_LINE_LENGTH + 2 lines long) "c" | "h" | "md" | "rs") length="$((TEMPLATE_LINE_LENGTH + 2))" @@ -66,7 +72,7 @@ if [ -f "$1" ]; then fi else fd --type file --hidden . | while read -r file; do - if grep --quiet 'SPDX-License-Identifier: GPL-3.0-or-later' "$file"; then + if grep --quiet 'SPDX-License-Identifier' "$file"; then filename="$(basename -- "$file")" extension="${filename##*.}" filename="${filename%.*}" diff --git a/templates/latex/.licensure.yml b/templates/latex/.licensure.yml index b7f963a..80d8f71 100644 --- a/templates/latex/.licensure.yml +++ b/templates/latex/.licensure.yml @@ -21,10 +21,10 @@ licenses: email: "benedikt.peetz@b-peetz.de" template: | - <TODO> 2024 - [year] (C) by [name of author] + TODO 2024 - [year] (C) by [name of author] SPDX-License-Identifier: CC-BY-SA-4.0 - <TODO> is licensed under a + TODO is licensed under a Creative Commons Attribution-ShareAlike 4.0 International License. You should have received a copy of the license along with this @@ -68,7 +68,7 @@ licenses: This file is part of the TODO. - Trixy is free software: you can redistribute it and/or modify + TODO is free software: you can redistribute it and/or modify it under the terms of the Lesser GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/templates/latex/scripts/renew_copyright_header.sh b/templates/latex/scripts/renew_copyright_header.sh index edb0a65..4f424c3 100755 --- a/templates/latex/scripts/renew_copyright_header.sh +++ b/templates/latex/scripts/renew_copyright_header.sh @@ -3,6 +3,7 @@ # NOTE: This is the line length of the .licensure.yml header template **plus** the extra # line after the template comment. TEMPLATE_LINE_LENGTH=20 +LATEX_TEMPLATE_LINE_LENGTH=9 PROJECT_ROOT="$(git rev-parse --show-toplevel)" @@ -17,6 +18,11 @@ remove() { "Makefile" | "toml" | "envrc" | "yml" | "gitignore" | "awk") sed --in-place "1,${TEMPLATE_LINE_LENGTH}d" "$file" ;; + # LaTeX files (or TeX files in general) have a different license, use the + # $LATEX_TEMPLATE_LINE_LENGTH variable. + "tex") + sed --in-place "1,${LATEX_TEMPLATE_LINE_LENGTH}d" "$file" + ;; # normal '/* ... */' like comments (these are $TEMPLATE_LINE_LENGTH + 2 lines long) "c" | "h" | "md" | "rs") length="$((TEMPLATE_LINE_LENGTH + 2))" @@ -66,7 +72,7 @@ if [ -f "$1" ]; then fi else fd --type file --hidden . | while read -r file; do - if grep --quiet 'SPDX-License-Identifier: GPL-3.0-or-later' "$file"; then + if grep --quiet 'SPDX-License-Identifier' "$file"; then filename="$(basename -- "$file")" extension="${filename##*.}" filename="${filename%.*}" diff --git a/templates/rust/.licensure.yml b/templates/rust/.licensure.yml index b7f963a..80d8f71 100644 --- a/templates/rust/.licensure.yml +++ b/templates/rust/.licensure.yml @@ -21,10 +21,10 @@ licenses: email: "benedikt.peetz@b-peetz.de" template: | - <TODO> 2024 - [year] (C) by [name of author] + TODO 2024 - [year] (C) by [name of author] SPDX-License-Identifier: CC-BY-SA-4.0 - <TODO> is licensed under a + TODO is licensed under a Creative Commons Attribution-ShareAlike 4.0 International License. You should have received a copy of the license along with this @@ -68,7 +68,7 @@ licenses: This file is part of the TODO. - Trixy is free software: you can redistribute it and/or modify + TODO is free software: you can redistribute it and/or modify it under the terms of the Lesser GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/templates/rust/scripts/renew_copyright_header.sh b/templates/rust/scripts/renew_copyright_header.sh index edb0a65..4f424c3 100755 --- a/templates/rust/scripts/renew_copyright_header.sh +++ b/templates/rust/scripts/renew_copyright_header.sh @@ -3,6 +3,7 @@ # NOTE: This is the line length of the .licensure.yml header template **plus** the extra # line after the template comment. TEMPLATE_LINE_LENGTH=20 +LATEX_TEMPLATE_LINE_LENGTH=9 PROJECT_ROOT="$(git rev-parse --show-toplevel)" @@ -17,6 +18,11 @@ remove() { "Makefile" | "toml" | "envrc" | "yml" | "gitignore" | "awk") sed --in-place "1,${TEMPLATE_LINE_LENGTH}d" "$file" ;; + # LaTeX files (or TeX files in general) have a different license, use the + # $LATEX_TEMPLATE_LINE_LENGTH variable. + "tex") + sed --in-place "1,${LATEX_TEMPLATE_LINE_LENGTH}d" "$file" + ;; # normal '/* ... */' like comments (these are $TEMPLATE_LINE_LENGTH + 2 lines long) "c" | "h" | "md" | "rs") length="$((TEMPLATE_LINE_LENGTH + 2))" @@ -66,7 +72,7 @@ if [ -f "$1" ]; then fi else fd --type file --hidden . | while read -r file; do - if grep --quiet 'SPDX-License-Identifier: GPL-3.0-or-later' "$file"; then + if grep --quiet 'SPDX-License-Identifier' "$file"; then filename="$(basename -- "$file")" extension="${filename##*.}" filename="${filename%.*}" diff --git a/templates/shell/.licensure.yml b/templates/shell/.licensure.yml index b7f963a..80d8f71 100644 --- a/templates/shell/.licensure.yml +++ b/templates/shell/.licensure.yml @@ -21,10 +21,10 @@ licenses: email: "benedikt.peetz@b-peetz.de" template: | - <TODO> 2024 - [year] (C) by [name of author] + TODO 2024 - [year] (C) by [name of author] SPDX-License-Identifier: CC-BY-SA-4.0 - <TODO> is licensed under a + TODO is licensed under a Creative Commons Attribution-ShareAlike 4.0 International License. You should have received a copy of the license along with this @@ -68,7 +68,7 @@ licenses: This file is part of the TODO. - Trixy is free software: you can redistribute it and/or modify + TODO is free software: you can redistribute it and/or modify it under the terms of the Lesser GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/templates/shell/scripts/renew_copyright_header.sh b/templates/shell/scripts/renew_copyright_header.sh index edb0a65..4f424c3 100755 --- a/templates/shell/scripts/renew_copyright_header.sh +++ b/templates/shell/scripts/renew_copyright_header.sh @@ -3,6 +3,7 @@ # NOTE: This is the line length of the .licensure.yml header template **plus** the extra # line after the template comment. TEMPLATE_LINE_LENGTH=20 +LATEX_TEMPLATE_LINE_LENGTH=9 PROJECT_ROOT="$(git rev-parse --show-toplevel)" @@ -17,6 +18,11 @@ remove() { "Makefile" | "toml" | "envrc" | "yml" | "gitignore" | "awk") sed --in-place "1,${TEMPLATE_LINE_LENGTH}d" "$file" ;; + # LaTeX files (or TeX files in general) have a different license, use the + # $LATEX_TEMPLATE_LINE_LENGTH variable. + "tex") + sed --in-place "1,${LATEX_TEMPLATE_LINE_LENGTH}d" "$file" + ;; # normal '/* ... */' like comments (these are $TEMPLATE_LINE_LENGTH + 2 lines long) "c" | "h" | "md" | "rs") length="$((TEMPLATE_LINE_LENGTH + 2))" @@ -66,7 +72,7 @@ if [ -f "$1" ]; then fi else fd --type file --hidden . | while read -r file; do - if grep --quiet 'SPDX-License-Identifier: GPL-3.0-or-later' "$file"; then + if grep --quiet 'SPDX-License-Identifier' "$file"; then filename="$(basename -- "$file")" extension="${filename##*.}" filename="${filename%.*}" |