From 209af7d8849515fd9f8bc2873bb7e999b2d14240 Mon Sep 17 00:00:00 2001
From: EuAndreh <eu@euandre.org>
Date: Sun, 4 Jul 2021 16:17:09 -0300
Subject: aux/: Update, adjust Makefile accordingly

---
 aux/ci/ci-build.sh |  2 +-
 aux/ci/report.sh   | 26 ++++++++++++++++++++++++--
 2 files changed, 25 insertions(+), 3 deletions(-)

(limited to 'aux/ci')

diff --git a/aux/ci/ci-build.sh b/aux/ci/ci-build.sh
index 7fa3382..be97866 100755
--- a/aux/ci/ci-build.sh
+++ b/aux/ci/ci-build.sh
@@ -26,7 +26,7 @@ EOF
 		git notes append -m "$NOTE"
 
 		cd -
-		sh aux/ci/report.sh "$PROJECT" public
+		sh aux/ci/report.sh -n "$PROJECT" -o public
 		rsync -av public/ "/srv/http/$PROJECT/" --delete
 
 		printf "\n>>>\n>>> CI logs added as Git note.\n>>>\n>>> Run status was %s" "$STATUS"
diff --git a/aux/ci/report.sh b/aux/ci/report.sh
index c873f54..69dbea3 100755
--- a/aux/ci/report.sh
+++ b/aux/ci/report.sh
@@ -1,9 +1,31 @@
 #!/bin/sh
 set -eu
 
-PROJECT="$1"
-OUTDIR="$2"
 TLD="$(cat aux/tld.txt)"
+while getopts 'n:o:' flag; do
+	case "$flag" in
+		n)
+			PROJECT="$OPTARG"
+			;;
+		o)
+			OUTDIR="$OPTARG"
+			;;
+		*)
+			exit 2
+			;;
+	esac
+done
+shift $((OPTIND - 1))
+
+assert_arg() {
+	if [ -z "$1" ]; then
+		echo "Missing $2" >&2
+		exit 2
+	fi
+}
+
+assert_arg "${PROJECT:-}" '-n PROJECT'
+assert_arg "${OUTDIR:-}"  '-o OUTDIR'
 
 PASS='✅'
 FAIL='❌'
-- 
cgit v1.2.3