From 57335b3e7c4c9e91c5747778180d611e5f15d144 Mon Sep 17 00:00:00 2001 From: EuAndreh Date: Wed, 23 Jun 2021 08:07:14 -0300 Subject: aux/: Explicitly pass "public/" as a parameter to scripts --- aux/workflow/TODOs.sh | 5 ++--- aux/workflow/commonmark.sh | 7 +++---- aux/workflow/public.sh | 13 ++++++++----- 3 files changed, 13 insertions(+), 12 deletions(-) (limited to 'aux/workflow') diff --git a/aux/workflow/TODOs.sh b/aux/workflow/TODOs.sh index 160e76f..f93ece8 100755 --- a/aux/workflow/TODOs.sh +++ b/aux/workflow/TODOs.sh @@ -1,11 +1,10 @@ #!/bin/sh set -eu -mkdir -p public - PROJECT_UC="$1" PROJECT="$2" MAILING_LIST="$3" +OUTDIR="$4" TLD="$(cat aux/tld.txt)" TODOS_ADD_REGEX='s/^## (TODO|DOING|WAITING|MEETING|INACTIVE|NEXT|CANCELLED|DONE) (.*) \{#(.*?)\}$/## \1<\/span> \2<\/a>\n
#\3<\/pre>\n/'
@@ -37,4 +36,4 @@ sed -e "s:@PROJECT_UC@:$PROJECT_UC:g"     \
 		| \
 	perl -pe "$TODOS_CLEANUP_REGEX1" | \
 	perl -pe "$TODOS_CLEANUP_REGEX2" \
-	> public/TODOs.html
+	> "$OUTDIR/TODOs.html"
diff --git a/aux/workflow/commonmark.sh b/aux/workflow/commonmark.sh
index 6016f51..7267145 100755
--- a/aux/workflow/commonmark.sh
+++ b/aux/workflow/commonmark.sh
@@ -1,11 +1,10 @@
 #!/bin/sh
 set -eu
 
-mkdir -p public
-
 PROJECT_UC="$1"
 F="$2"
-OUT="${3:-${F%.*}.html}"
+OUTDIR="$3"
+OUT="${4:-${F%.*}.html}"
 
 pandoc \
 	--toc                                    \
@@ -17,4 +16,4 @@ pandoc \
 	-r commonmark                            \
 	-w html                                  \
 	-H aux/workflow/favicon.html             \
-	< "$F" > "public/$OUT"
+	< "$F" > "$OUTDIR/$OUT"
diff --git a/aux/workflow/public.sh b/aux/workflow/public.sh
index df87049..5222878 100755
--- a/aux/workflow/public.sh
+++ b/aux/workflow/public.sh
@@ -4,14 +4,17 @@ set -eu
 PROJECT_UC="$1"
 PROJECT="$2"
 MAILING_LIST="$3"
+OUTDIR="$4"
 
-sh aux/workflow/TODOs.sh  "$PROJECT_UC" "$PROJECT" "$MAILING_LIST"
-sh aux/workflow/commonmark.sh "$PROJECT" README.md index.html ||:
+mkdir -p "$OUTDIR"
+
+sh aux/workflow/TODOs.sh  "$PROJECT_UC" "$PROJECT" "$MAILING_LIST" "$OUTDIR"
+sh aux/workflow/commonmark.sh "$PROJECT" README.md "$OUTDIR" index.html ||:
 
 if [ -f CHANGELOG.md ]; then
-	sh aux/workflow/commonmark.sh "$PROJECT" CHANGELOG.md
+	sh aux/workflow/commonmark.sh "$PROJECT" CHANGELOG.md "$OUTDIR"
 fi
 
-sh aux/ci/report.sh "$PROJECT"
+sh aux/ci/report.sh "$PROJECT" "$OUTDIR"
 
-cp aux/workflow/favicon.{svg,png} public/
+cp aux/workflow/favicon.{svg,png} "$OUTDIR"
-- 
cgit v1.2.3