From 5f52853ce4a03b0b1c1dc6a4f252bd8107083652 Mon Sep 17 00:00:00 2001 From: EuAndreh Date: Sun, 6 Mar 2022 14:05:23 -0300 Subject: aux/: Update --- aux/workflow/TODOs.sh | 13 +++------- aux/workflow/assert-todos.sh | 61 +++++++------------------------------------- aux/workflow/dist.sh | 2 +- aux/workflow/style.css | 46 ++++++++++++++++++++++----------- 4 files changed, 44 insertions(+), 78 deletions(-) (limited to 'aux/workflow') diff --git a/aux/workflow/TODOs.sh b/aux/workflow/TODOs.sh index efc0b04..05cf3cb 100755 --- a/aux/workflow/TODOs.sh +++ b/aux/workflow/TODOs.sh @@ -40,20 +40,13 @@ if [ -z "${PROJECT_UC:-}" ]; then fi -# shellcheck disable=1004 -IDS_REGEX='s:^## \(TODO\|DOING\|WAITING\|MEETING\|INACTIVE\|NEXT\|CANCELLED\|DONE\|WONTFIX\) \(.*\) {#\(.*\)}\(.*\)$:## \1 \2\4\ -
#\3
\ -:g' -TAGS_REGEX='s|tag:\([a-z0-9-]*\)|\1|g' - -cat aux/workflow/preamble.md TODOs.md | +td -H | + cat aux/workflow/preamble.md - | sed \ -e "s:@PROJECT_UC@:$PROJECT_UC:g" \ -e "s:@PROJECT@:$PROJECT:g" \ -e "s:@MAILING_LIST@:$MAILING_LIST:g" \ - -e "s:@TLD@:$TLD:g" \ - -e "$IDS_REGEX" \ - -e "$TAGS_REGEX" | + -e "s:@TLD@:$TLD:g" | pandoc \ --toc \ --highlight-style pygments \ diff --git a/aux/workflow/assert-todos.sh b/aux/workflow/assert-todos.sh index bc4907d..f4fd965 100755 --- a/aux/workflow/assert-todos.sh +++ b/aux/workflow/assert-todos.sh @@ -1,58 +1,15 @@ #!/bin/sh set -eu -if [ -e .git ] && git grep FIXME | grep -v '^TODOs.md' | - grep -v '^aux/workflow/assert-todos.sh'; then - echo "Found dangling FIXME markers on the project." - echo "You should write them down properly on TODOs.md." +# shellcheck disable=2086 +if [ -e .git ] && + git grep FIXME ${1:-} | + grep -v '^TODOs.md:' | + grep -v '^aux/workflow/assert-todos.sh:' +then + echo "Found dangling FIXME markers on the project." >&2 + echo "You should write them down properly on TODOs.md." >&2 exit 1 fi -awk -F'{#' ' -BEGIN { - exitstatus = 0 - h2flag = 0 - h2status = "" - prevline = "" - idx = 0 - delete ids[0] -} -h2flag == 1 { - split($0, l, " ") - timelinestatus = l[2] - if (h2status != timelinestatus) { - print "h2/timeline status mismatch for line " NR-1 - print prevline - print $0 - exitstatus = 1 - } - h2status = "" - h2flag = 0 -} - -/^## (TODO|DOING|WAITING|MEETING|INACTIVE|NEXT|CANCELLED|DONE|WONTFIX)/ { - if (match($0, / \{#.*?\}.*$/) == 0) { - print "Missing ID for line " NR ":\n" $0 - exitstatus = 1 - } - id_with_prefix = substr($2, 0, length($2) - 1) - match(id_with_prefix, /^\w+-/) - id = substr(id_with_prefix, RLENGTH + 1) - if (id in arr) { - print "Duplicate ID: " id - exitstatus = 1 - } else { - arr[id] = 1 - } - - split($0, l, " ") - h2status = l[2] - h2flag = 1 - prevline = $0 -} - - -/^# Scratch$/ { - exit exitstatus -} -' TODOs.md +td -L diff --git a/aux/workflow/dist.sh b/aux/workflow/dist.sh index 48a9d57..68f8849 100755 --- a/aux/workflow/dist.sh +++ b/aux/workflow/dist.sh @@ -81,7 +81,7 @@ if [ "Release $VVERSION" != "$(git log --format=%B -1 HEAD | head -n1)" ]; then fi make clean -make dev-check EXTRA_VERSION="$VVERSION" +env ASSERT_NO_MISSING_TRANSLATIONS=1 make dev-check EXTRA_VERSION="$VVERSION" if ! (git diff --quiet && git diff --quiet --staged); then echo 'Dirty repository.' diff --git a/aux/workflow/style.css b/aux/workflow/style.css index 56e4712..99980aa 100644 --- a/aux/workflow/style.css +++ b/aux/workflow/style.css @@ -1,19 +1,4 @@ -- cgit v1.2.3