From 9d1b58631d9d24c5573abd741f58917095d2e5ca Mon Sep 17 00:00:00 2001 From: Anmol Sethi Date: Thu, 8 Dec 2022 04:17:59 -0800 Subject: [PATCH 1/2] fmt.sh: Render all d2 diagrams automatically Closes #1 --- bin/fmt.sh | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/bin/fmt.sh b/bin/fmt.sh index 2524175..4772135 100755 --- a/bin/fmt.sh +++ b/bin/fmt.sh @@ -48,6 +48,13 @@ trailing_whitespace() { sh_c find . -name "'*.sedbak'" -delete } +d2() { + if ! command -v d2 /dev/null && [ -n "${CI-}" ]; then + curl -fsSL https://d2lang.com/install.sh | sh -s -- + fi + sh_c hide XARGS_N=1 xargsd "'\.\(d2\)$'" d2 +} + main() { job_parseflags "$@" ensure_changed_files @@ -69,6 +76,9 @@ main() { if <"$CHANGED_FILES" grep -q '\.\(js\|jsx\|ts\|tsx\|scss\|css\|html\)$'; then runjob prettier & fi + if <"$CHANGED_FILES" grep -qm1 '\.\(d2\)$'; then + runjob d2 & + fi waitjobs } From 9583ed87b1e338ba55e4b54749e61bb8e4909a4f Mon Sep 17 00:00:00 2001 From: Anmol Sethi Date: Tue, 24 Jan 2023 14:07:10 -0800 Subject: [PATCH 2/2] fmt.sh: Format all d2 files --- bin/fmt.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/bin/fmt.sh b/bin/fmt.sh index 4772135..593a279 100755 --- a/bin/fmt.sh +++ b/bin/fmt.sh @@ -48,11 +48,11 @@ trailing_whitespace() { sh_c find . -name "'*.sedbak'" -delete } -d2() { +d2fmt() { if ! command -v d2 /dev/null && [ -n "${CI-}" ]; then curl -fsSL https://d2lang.com/install.sh | sh -s -- fi - sh_c hide XARGS_N=1 xargsd "'\.\(d2\)$'" d2 + sh_c hide XARGS_N=1 xargsd "'\.\(d2\)$'" d2 fmt } main() { @@ -77,7 +77,7 @@ main() { runjob prettier & fi if <"$CHANGED_FILES" grep -qm1 '\.\(d2\)$'; then - runjob d2 & + runjob d2fmt & fi waitjobs }