diff options
Diffstat (limited to 'build')
32 files changed, 125 insertions, 75 deletions
diff --git a/build/awk/init b/build/awk/init index d2eb028..7c8138a 100644 --- a/build/awk/init +++ b/build/awk/init @@ -147,6 +147,8 @@ if [ -e ./.reuse/templates/default.jinja2 ]; then fi cat <<EOF | fmt --uniform-spacing --width=85 --split-only >./.reuse/templates/default.jinja2 +$APPLICATION_NAME_STYLIZED$description_str + {% for copyright_line in copyright_lines %} {{ copyright_line }} {% endfor %} @@ -157,7 +159,7 @@ SPDX-FileContributor: {{ contributor_line }} SPDX-License-Identifier: {{ expression }} {% endfor %} -This file is part of $APPLICATION_NAME_STYLIZED$description_str. +This file is part of $APPLICATION_NAME_STYLIZED. You should have received a copy of the License along with this program. If not, see <$LICENSE_URL>. diff --git a/build/awk/scripts/optimize_images.sh b/build/awk/scripts/optimize_images.sh index 0f48e4b..444405d 100755 --- a/build/awk/scripts/optimize_images.sh +++ b/build/awk/scripts/optimize_images.sh @@ -25,7 +25,8 @@ find_files_by_extension() { tmp="$(mktemp)" git ls-files --cached --modified --other --exclude-standard --deduplicate | while IFS= read -r file; do - extension="${file#*.}" + file_basename="$(basename "$file")" + extension="${file_basename#*.}" if [ "$extension" = "$wanted_extension" ]; then echo "$file" else @@ -90,7 +91,7 @@ optimize_files() { TOTAL_SAVED_INNER=0 while IFS= read -r f; do - printf "%-2s/${COUNT} $f ... " "$I" + printf "%s/${COUNT} $f ... " "$I" SIZE="$(size_of "$f")" diff --git a/build/awk/shell_line_editor.sh b/build/awk/shell_line_editor.sh index 8d6833a..a142706 100644 --- a/build/awk/shell_line_editor.sh +++ b/build/awk/shell_line_editor.sh @@ -1,6 +1,8 @@ -#! /usr/bin/env sh +#! /usr/bin/env false # Taken in verbatim from: https://unix.stackexchange.com/a/113450, and somewhat changed +# shellcheck shell=dash + LE_print_debug() { LE_debug="$1" LE_debug_msg="$2" @@ -245,3 +247,5 @@ LE() { echo return "$LE_ret" } + +# vim: ft=sh diff --git a/build/c/init b/build/c/init index d2eb028..7c8138a 100644 --- a/build/c/init +++ b/build/c/init @@ -147,6 +147,8 @@ if [ -e ./.reuse/templates/default.jinja2 ]; then fi cat <<EOF | fmt --uniform-spacing --width=85 --split-only >./.reuse/templates/default.jinja2 +$APPLICATION_NAME_STYLIZED$description_str + {% for copyright_line in copyright_lines %} {{ copyright_line }} {% endfor %} @@ -157,7 +159,7 @@ SPDX-FileContributor: {{ contributor_line }} SPDX-License-Identifier: {{ expression }} {% endfor %} -This file is part of $APPLICATION_NAME_STYLIZED$description_str. +This file is part of $APPLICATION_NAME_STYLIZED. You should have received a copy of the License along with this program. If not, see <$LICENSE_URL>. diff --git a/build/c/scripts/optimize_images.sh b/build/c/scripts/optimize_images.sh index 0f48e4b..444405d 100755 --- a/build/c/scripts/optimize_images.sh +++ b/build/c/scripts/optimize_images.sh @@ -25,7 +25,8 @@ find_files_by_extension() { tmp="$(mktemp)" git ls-files --cached --modified --other --exclude-standard --deduplicate | while IFS= read -r file; do - extension="${file#*.}" + file_basename="$(basename "$file")" + extension="${file_basename#*.}" if [ "$extension" = "$wanted_extension" ]; then echo "$file" else @@ -90,7 +91,7 @@ optimize_files() { TOTAL_SAVED_INNER=0 while IFS= read -r f; do - printf "%-2s/${COUNT} $f ... " "$I" + printf "%s/${COUNT} $f ... " "$I" SIZE="$(size_of "$f")" diff --git a/build/c/shell_line_editor.sh b/build/c/shell_line_editor.sh index 8d6833a..a142706 100644 --- a/build/c/shell_line_editor.sh +++ b/build/c/shell_line_editor.sh @@ -1,6 +1,8 @@ -#! /usr/bin/env sh +#! /usr/bin/env false # Taken in verbatim from: https://unix.stackexchange.com/a/113450, and somewhat changed +# shellcheck shell=dash + LE_print_debug() { LE_debug="$1" LE_debug_msg="$2" @@ -245,3 +247,5 @@ LE() { echo return "$LE_ret" } + +# vim: ft=sh diff --git a/build/latex/academia/build.sh b/build/latex/academia/build.sh index 80ecc57..3cc579a 100755 --- a/build/latex/academia/build.sh +++ b/build/latex/academia/build.sh @@ -23,7 +23,7 @@ for arg in "$@"; do done # find all directories which are not the destination dir or inside it -find "$root" -type d -not -name "$dst" -not -path "./$dst/*" -printf '%P\n' | while IFS= read -r dir; do +fd . "$root" --type directory --exclude "$dst" --exclude "./$dst/*" --hidden --exec realpath --relative-to=. {} | while IFS= read -r dir; do mkdir --parents "$dst/$dir" done diff --git a/build/latex/academia/content/static/title.tex b/build/latex/academia/content/static/title.tex index 16537c9..79d87cd 100644 --- a/build/latex/academia/content/static/title.tex +++ b/build/latex/academia/content/static/title.tex @@ -1,3 +1,4 @@ +%! TEX root = ../../%INIT_APPLICATION_NAME.tex % LTeX: language=%INIT_LANGUAGE \maketitle diff --git a/build/latex/academia/headers/preamble/academia/theorems/definitions.tex b/build/latex/academia/headers/preamble/academia/theorems/definitions.tex index 3179dd9..e713dbc 100644 --- a/build/latex/academia/headers/preamble/academia/theorems/definitions.tex +++ b/build/latex/academia/headers/preamble/academia/theorems/definitions.tex @@ -1,5 +1,5 @@ -\RenewDocumentCommand\qedsymbol{}{\ensuremath{\text{\textit{O.}}~\epsilon.~\delta.}} -% \renewcommand\qedsymbol{\dots} +% \RenewExpandableDocumentCommand\qedsymbol{}{\ensuremath{\text{\textit{O.}}~\epsilon.~\delta.}} +\RenewExpandableDocumentCommand\qedsymbol{}{\dots} \theoremstyle{definition} diff --git a/build/latex/academia/init b/build/latex/academia/init index d2eb028..7c8138a 100644 --- a/build/latex/academia/init +++ b/build/latex/academia/init @@ -147,6 +147,8 @@ if [ -e ./.reuse/templates/default.jinja2 ]; then fi cat <<EOF | fmt --uniform-spacing --width=85 --split-only >./.reuse/templates/default.jinja2 +$APPLICATION_NAME_STYLIZED$description_str + {% for copyright_line in copyright_lines %} {{ copyright_line }} {% endfor %} @@ -157,7 +159,7 @@ SPDX-FileContributor: {{ contributor_line }} SPDX-License-Identifier: {{ expression }} {% endfor %} -This file is part of $APPLICATION_NAME_STYLIZED$description_str. +This file is part of $APPLICATION_NAME_STYLIZED. You should have received a copy of the License along with this program. If not, see <$LICENSE_URL>. diff --git a/build/latex/academia/init.local b/build/latex/academia/init.local index 123e349..0e61b4d 100755 --- a/build/latex/academia/init.local +++ b/build/latex/academia/init.local @@ -1,16 +1,16 @@ #!/usr/bin/env sh -prompt LANGUAGE "The language to use in the latex documents" "en_GB" +prompt LANGUAGE "The language to use in the latex documents" "en-GB" bable_language="" case "$LANGUAGE" in -"en_GB") +en-GB) bable_language="british" ;; -en_*) +en-*) bable_language="english" ;; -de_DE | de_*) +de-DE | de-*) bable_language="ngerman" ;; @@ -30,29 +30,29 @@ fi siunitx_language="" # locales UK, US, DE (Germany), PL (Poland), FR (French), SI (Slovene) and ZA (South Africa). case "$LANGUAGE" in -"en_GB") +en-GB) siunitx_language="UK" # United Kingdom ;; -"en_US") +en-US) siunitx_language="US" # United States of Amerika ;; -en_ZA) +en-ZA) siunitx_language="ZA" # South Africa ;; -en_*) +en-*) echo "'$LANGUAGE' is not yet recognized! But it seems english, thus we set SIUNITX_LANGUAGE='UK'." siunitx_language="UK" ;; -de_DE) +de-DE) siunitx_language="DE" # Germany ;; -pl_PL) +pl-PL) siunitx_language="PL" # Poland ;; -fr_FR) +fr-FR) siunitx_language="FR" # French ;; -sl_SL) +sl-SL) siunitx_language="SI" # Slovene ;; *) @@ -63,7 +63,7 @@ sl_SL) esac prompt BABLE_LANGUAGE "The language to use for the bable package" "$bable_language" "dont_ask" -prompt DATE_TIME_LANGUAGE "The language to use for the datetime2 package" "$(echo "$LANGUAGE" | sed 's/_/-/g')" "dont_ask" +prompt DATE_TIME_LANGUAGE "The language to use for the datetime2 package" "$LANGUAGE" "dont_ask" prompt SIUNITX_LANGUAGE "The language to use for the siunitx package" "$siunitx_language" "dont_ask" prompt TODONOTES_LANGUAGE "The language to use for the todonotes package" "$todonotes_language" "dont_ask" diff --git a/build/latex/academia/scripts/optimize_images.sh b/build/latex/academia/scripts/optimize_images.sh index 0f48e4b..444405d 100755 --- a/build/latex/academia/scripts/optimize_images.sh +++ b/build/latex/academia/scripts/optimize_images.sh @@ -25,7 +25,8 @@ find_files_by_extension() { tmp="$(mktemp)" git ls-files --cached --modified --other --exclude-standard --deduplicate | while IFS= read -r file; do - extension="${file#*.}" + file_basename="$(basename "$file")" + extension="${file_basename#*.}" if [ "$extension" = "$wanted_extension" ]; then echo "$file" else @@ -90,7 +91,7 @@ optimize_files() { TOTAL_SAVED_INNER=0 while IFS= read -r f; do - printf "%-2s/${COUNT} $f ... " "$I" + printf "%s/${COUNT} $f ... " "$I" SIZE="$(size_of "$f")" diff --git a/build/latex/academia/shell_line_editor.sh b/build/latex/academia/shell_line_editor.sh index 8d6833a..a142706 100644 --- a/build/latex/academia/shell_line_editor.sh +++ b/build/latex/academia/shell_line_editor.sh @@ -1,6 +1,8 @@ -#! /usr/bin/env sh +#! /usr/bin/env false # Taken in verbatim from: https://unix.stackexchange.com/a/113450, and somewhat changed +# shellcheck shell=dash + LE_print_debug() { LE_debug="$1" LE_debug_msg="$2" @@ -245,3 +247,5 @@ LE() { echo return "$LE_ret" } + +# vim: ft=sh diff --git a/build/latex/letter/build.sh b/build/latex/letter/build.sh index 80ecc57..3cc579a 100755 --- a/build/latex/letter/build.sh +++ b/build/latex/letter/build.sh @@ -23,7 +23,7 @@ for arg in "$@"; do done # find all directories which are not the destination dir or inside it -find "$root" -type d -not -name "$dst" -not -path "./$dst/*" -printf '%P\n' | while IFS= read -r dir; do +fd . "$root" --type directory --exclude "$dst" --exclude "./$dst/*" --hidden --exec realpath --relative-to=. {} | while IFS= read -r dir; do mkdir --parents "$dst/$dir" done diff --git a/build/latex/letter/init b/build/latex/letter/init index d2eb028..7c8138a 100644 --- a/build/latex/letter/init +++ b/build/latex/letter/init @@ -147,6 +147,8 @@ if [ -e ./.reuse/templates/default.jinja2 ]; then fi cat <<EOF | fmt --uniform-spacing --width=85 --split-only >./.reuse/templates/default.jinja2 +$APPLICATION_NAME_STYLIZED$description_str + {% for copyright_line in copyright_lines %} {{ copyright_line }} {% endfor %} @@ -157,7 +159,7 @@ SPDX-FileContributor: {{ contributor_line }} SPDX-License-Identifier: {{ expression }} {% endfor %} -This file is part of $APPLICATION_NAME_STYLIZED$description_str. +This file is part of $APPLICATION_NAME_STYLIZED. You should have received a copy of the License along with this program. If not, see <$LICENSE_URL>. diff --git a/build/latex/letter/init.local b/build/latex/letter/init.local index 123e349..0e61b4d 100755 --- a/build/latex/letter/init.local +++ b/build/latex/letter/init.local @@ -1,16 +1,16 @@ #!/usr/bin/env sh -prompt LANGUAGE "The language to use in the latex documents" "en_GB" +prompt LANGUAGE "The language to use in the latex documents" "en-GB" bable_language="" case "$LANGUAGE" in -"en_GB") +en-GB) bable_language="british" ;; -en_*) +en-*) bable_language="english" ;; -de_DE | de_*) +de-DE | de-*) bable_language="ngerman" ;; @@ -30,29 +30,29 @@ fi siunitx_language="" # locales UK, US, DE (Germany), PL (Poland), FR (French), SI (Slovene) and ZA (South Africa). case "$LANGUAGE" in -"en_GB") +en-GB) siunitx_language="UK" # United Kingdom ;; -"en_US") +en-US) siunitx_language="US" # United States of Amerika ;; -en_ZA) +en-ZA) siunitx_language="ZA" # South Africa ;; -en_*) +en-*) echo "'$LANGUAGE' is not yet recognized! But it seems english, thus we set SIUNITX_LANGUAGE='UK'." siunitx_language="UK" ;; -de_DE) +de-DE) siunitx_language="DE" # Germany ;; -pl_PL) +pl-PL) siunitx_language="PL" # Poland ;; -fr_FR) +fr-FR) siunitx_language="FR" # French ;; -sl_SL) +sl-SL) siunitx_language="SI" # Slovene ;; *) @@ -63,7 +63,7 @@ sl_SL) esac prompt BABLE_LANGUAGE "The language to use for the bable package" "$bable_language" "dont_ask" -prompt DATE_TIME_LANGUAGE "The language to use for the datetime2 package" "$(echo "$LANGUAGE" | sed 's/_/-/g')" "dont_ask" +prompt DATE_TIME_LANGUAGE "The language to use for the datetime2 package" "$LANGUAGE" "dont_ask" prompt SIUNITX_LANGUAGE "The language to use for the siunitx package" "$siunitx_language" "dont_ask" prompt TODONOTES_LANGUAGE "The language to use for the todonotes package" "$todonotes_language" "dont_ask" diff --git a/build/latex/letter/scripts/optimize_images.sh b/build/latex/letter/scripts/optimize_images.sh index 0f48e4b..444405d 100755 --- a/build/latex/letter/scripts/optimize_images.sh +++ b/build/latex/letter/scripts/optimize_images.sh @@ -25,7 +25,8 @@ find_files_by_extension() { tmp="$(mktemp)" git ls-files --cached --modified --other --exclude-standard --deduplicate | while IFS= read -r file; do - extension="${file#*.}" + file_basename="$(basename "$file")" + extension="${file_basename#*.}" if [ "$extension" = "$wanted_extension" ]; then echo "$file" else @@ -90,7 +91,7 @@ optimize_files() { TOTAL_SAVED_INNER=0 while IFS= read -r f; do - printf "%-2s/${COUNT} $f ... " "$I" + printf "%s/${COUNT} $f ... " "$I" SIZE="$(size_of "$f")" diff --git a/build/latex/letter/shell_line_editor.sh b/build/latex/letter/shell_line_editor.sh index 8d6833a..a142706 100644 --- a/build/latex/letter/shell_line_editor.sh +++ b/build/latex/letter/shell_line_editor.sh @@ -1,6 +1,8 @@ -#! /usr/bin/env sh +#! /usr/bin/env false # Taken in verbatim from: https://unix.stackexchange.com/a/113450, and somewhat changed +# shellcheck shell=dash + LE_print_debug() { LE_debug="$1" LE_debug_msg="$2" @@ -245,3 +247,5 @@ LE() { echo return "$LE_ret" } + +# vim: ft=sh diff --git a/build/latex/presentation/build.sh b/build/latex/presentation/build.sh index 80ecc57..3cc579a 100755 --- a/build/latex/presentation/build.sh +++ b/build/latex/presentation/build.sh @@ -23,7 +23,7 @@ for arg in "$@"; do done # find all directories which are not the destination dir or inside it -find "$root" -type d -not -name "$dst" -not -path "./$dst/*" -printf '%P\n' | while IFS= read -r dir; do +fd . "$root" --type directory --exclude "$dst" --exclude "./$dst/*" --hidden --exec realpath --relative-to=. {} | while IFS= read -r dir; do mkdir --parents "$dst/$dir" done diff --git a/build/latex/presentation/content/static/questions.tex b/build/latex/presentation/content/static/questions.tex index 21126c5..2d21be7 100644 --- a/build/latex/presentation/content/static/questions.tex +++ b/build/latex/presentation/content/static/questions.tex @@ -1,3 +1,4 @@ +%! TEX root = ../../%INIT_APPLICATION_NAME.tex % LTeX: language=%INIT_LANGUAGE { diff --git a/build/latex/presentation/content/static/title.tex b/build/latex/presentation/content/static/title.tex index 9078b0c..b51a6fc 100644 --- a/build/latex/presentation/content/static/title.tex +++ b/build/latex/presentation/content/static/title.tex @@ -1,3 +1,4 @@ +%! TEX root = ../../%INIT_APPLICATION_NAME.tex % LTeX: language=%INIT_LANGUAGE \maketitle diff --git a/build/latex/presentation/flake.nix b/build/latex/presentation/flake.nix index 8bdb11b..bb4773a 100644 --- a/build/latex/presentation/flake.nix +++ b/build/latex/presentation/flake.nix @@ -46,9 +46,7 @@ }; crane = { url = "github:ipetkov/crane"; - inputs = { - nixpkgs.follows = "nixpkgs"; - }; + inputs = {}; }; rust-overlay = { url = "github:oxalica/rust-overlay"; diff --git a/build/latex/presentation/init b/build/latex/presentation/init index d2eb028..7c8138a 100644 --- a/build/latex/presentation/init +++ b/build/latex/presentation/init @@ -147,6 +147,8 @@ if [ -e ./.reuse/templates/default.jinja2 ]; then fi cat <<EOF | fmt --uniform-spacing --width=85 --split-only >./.reuse/templates/default.jinja2 +$APPLICATION_NAME_STYLIZED$description_str + {% for copyright_line in copyright_lines %} {{ copyright_line }} {% endfor %} @@ -157,7 +159,7 @@ SPDX-FileContributor: {{ contributor_line }} SPDX-License-Identifier: {{ expression }} {% endfor %} -This file is part of $APPLICATION_NAME_STYLIZED$description_str. +This file is part of $APPLICATION_NAME_STYLIZED. You should have received a copy of the License along with this program. If not, see <$LICENSE_URL>. diff --git a/build/latex/presentation/init.local b/build/latex/presentation/init.local index 123e349..0e61b4d 100755 --- a/build/latex/presentation/init.local +++ b/build/latex/presentation/init.local @@ -1,16 +1,16 @@ #!/usr/bin/env sh -prompt LANGUAGE "The language to use in the latex documents" "en_GB" +prompt LANGUAGE "The language to use in the latex documents" "en-GB" bable_language="" case "$LANGUAGE" in -"en_GB") +en-GB) bable_language="british" ;; -en_*) +en-*) bable_language="english" ;; -de_DE | de_*) +de-DE | de-*) bable_language="ngerman" ;; @@ -30,29 +30,29 @@ fi siunitx_language="" # locales UK, US, DE (Germany), PL (Poland), FR (French), SI (Slovene) and ZA (South Africa). case "$LANGUAGE" in -"en_GB") +en-GB) siunitx_language="UK" # United Kingdom ;; -"en_US") +en-US) siunitx_language="US" # United States of Amerika ;; -en_ZA) +en-ZA) siunitx_language="ZA" # South Africa ;; -en_*) +en-*) echo "'$LANGUAGE' is not yet recognized! But it seems english, thus we set SIUNITX_LANGUAGE='UK'." siunitx_language="UK" ;; -de_DE) +de-DE) siunitx_language="DE" # Germany ;; -pl_PL) +pl-PL) siunitx_language="PL" # Poland ;; -fr_FR) +fr-FR) siunitx_language="FR" # French ;; -sl_SL) +sl-SL) siunitx_language="SI" # Slovene ;; *) @@ -63,7 +63,7 @@ sl_SL) esac prompt BABLE_LANGUAGE "The language to use for the bable package" "$bable_language" "dont_ask" -prompt DATE_TIME_LANGUAGE "The language to use for the datetime2 package" "$(echo "$LANGUAGE" | sed 's/_/-/g')" "dont_ask" +prompt DATE_TIME_LANGUAGE "The language to use for the datetime2 package" "$LANGUAGE" "dont_ask" prompt SIUNITX_LANGUAGE "The language to use for the siunitx package" "$siunitx_language" "dont_ask" prompt TODONOTES_LANGUAGE "The language to use for the todonotes package" "$todonotes_language" "dont_ask" diff --git a/build/latex/presentation/scripts/optimize_images.sh b/build/latex/presentation/scripts/optimize_images.sh index 0f48e4b..444405d 100755 --- a/build/latex/presentation/scripts/optimize_images.sh +++ b/build/latex/presentation/scripts/optimize_images.sh @@ -25,7 +25,8 @@ find_files_by_extension() { tmp="$(mktemp)" git ls-files --cached --modified --other --exclude-standard --deduplicate | while IFS= read -r file; do - extension="${file#*.}" + file_basename="$(basename "$file")" + extension="${file_basename#*.}" if [ "$extension" = "$wanted_extension" ]; then echo "$file" else @@ -90,7 +91,7 @@ optimize_files() { TOTAL_SAVED_INNER=0 while IFS= read -r f; do - printf "%-2s/${COUNT} $f ... " "$I" + printf "%s/${COUNT} $f ... " "$I" SIZE="$(size_of "$f")" diff --git a/build/latex/presentation/shell_line_editor.sh b/build/latex/presentation/shell_line_editor.sh index 8d6833a..a142706 100644 --- a/build/latex/presentation/shell_line_editor.sh +++ b/build/latex/presentation/shell_line_editor.sh @@ -1,6 +1,8 @@ -#! /usr/bin/env sh +#! /usr/bin/env false # Taken in verbatim from: https://unix.stackexchange.com/a/113450, and somewhat changed +# shellcheck shell=dash + LE_print_debug() { LE_debug="$1" LE_debug_msg="$2" @@ -245,3 +247,5 @@ LE() { echo return "$LE_ret" } + +# vim: ft=sh diff --git a/build/rust/init b/build/rust/init index d2eb028..7c8138a 100644 --- a/build/rust/init +++ b/build/rust/init @@ -147,6 +147,8 @@ if [ -e ./.reuse/templates/default.jinja2 ]; then fi cat <<EOF | fmt --uniform-spacing --width=85 --split-only >./.reuse/templates/default.jinja2 +$APPLICATION_NAME_STYLIZED$description_str + {% for copyright_line in copyright_lines %} {{ copyright_line }} {% endfor %} @@ -157,7 +159,7 @@ SPDX-FileContributor: {{ contributor_line }} SPDX-License-Identifier: {{ expression }} {% endfor %} -This file is part of $APPLICATION_NAME_STYLIZED$description_str. +This file is part of $APPLICATION_NAME_STYLIZED. You should have received a copy of the License along with this program. If not, see <$LICENSE_URL>. diff --git a/build/rust/scripts/optimize_images.sh b/build/rust/scripts/optimize_images.sh index 0f48e4b..444405d 100755 --- a/build/rust/scripts/optimize_images.sh +++ b/build/rust/scripts/optimize_images.sh @@ -25,7 +25,8 @@ find_files_by_extension() { tmp="$(mktemp)" git ls-files --cached --modified --other --exclude-standard --deduplicate | while IFS= read -r file; do - extension="${file#*.}" + file_basename="$(basename "$file")" + extension="${file_basename#*.}" if [ "$extension" = "$wanted_extension" ]; then echo "$file" else @@ -90,7 +91,7 @@ optimize_files() { TOTAL_SAVED_INNER=0 while IFS= read -r f; do - printf "%-2s/${COUNT} $f ... " "$I" + printf "%s/${COUNT} $f ... " "$I" SIZE="$(size_of "$f")" diff --git a/build/rust/shell_line_editor.sh b/build/rust/shell_line_editor.sh index 8d6833a..a142706 100644 --- a/build/rust/shell_line_editor.sh +++ b/build/rust/shell_line_editor.sh @@ -1,6 +1,8 @@ -#! /usr/bin/env sh +#! /usr/bin/env false # Taken in verbatim from: https://unix.stackexchange.com/a/113450, and somewhat changed +# shellcheck shell=dash + LE_print_debug() { LE_debug="$1" LE_debug_msg="$2" @@ -245,3 +247,5 @@ LE() { echo return "$LE_ret" } + +# vim: ft=sh diff --git a/build/shell/init b/build/shell/init index d2eb028..7c8138a 100644 --- a/build/shell/init +++ b/build/shell/init @@ -147,6 +147,8 @@ if [ -e ./.reuse/templates/default.jinja2 ]; then fi cat <<EOF | fmt --uniform-spacing --width=85 --split-only >./.reuse/templates/default.jinja2 +$APPLICATION_NAME_STYLIZED$description_str + {% for copyright_line in copyright_lines %} {{ copyright_line }} {% endfor %} @@ -157,7 +159,7 @@ SPDX-FileContributor: {{ contributor_line }} SPDX-License-Identifier: {{ expression }} {% endfor %} -This file is part of $APPLICATION_NAME_STYLIZED$description_str. +This file is part of $APPLICATION_NAME_STYLIZED. You should have received a copy of the License along with this program. If not, see <$LICENSE_URL>. diff --git a/build/shell/scripts/optimize_images.sh b/build/shell/scripts/optimize_images.sh index 0f48e4b..444405d 100755 --- a/build/shell/scripts/optimize_images.sh +++ b/build/shell/scripts/optimize_images.sh @@ -25,7 +25,8 @@ find_files_by_extension() { tmp="$(mktemp)" git ls-files --cached --modified --other --exclude-standard --deduplicate | while IFS= read -r file; do - extension="${file#*.}" + file_basename="$(basename "$file")" + extension="${file_basename#*.}" if [ "$extension" = "$wanted_extension" ]; then echo "$file" else @@ -90,7 +91,7 @@ optimize_files() { TOTAL_SAVED_INNER=0 while IFS= read -r f; do - printf "%-2s/${COUNT} $f ... " "$I" + printf "%s/${COUNT} $f ... " "$I" SIZE="$(size_of "$f")" diff --git a/build/shell/shell_line_editor.sh b/build/shell/shell_line_editor.sh index 8d6833a..a142706 100644 --- a/build/shell/shell_line_editor.sh +++ b/build/shell/shell_line_editor.sh @@ -1,6 +1,8 @@ -#! /usr/bin/env sh +#! /usr/bin/env false # Taken in verbatim from: https://unix.stackexchange.com/a/113450, and somewhat changed +# shellcheck shell=dash + LE_print_debug() { LE_debug="$1" LE_debug_msg="$2" @@ -245,3 +247,5 @@ LE() { echo return "$LE_ret" } + +# vim: ft=sh |