Refactor system diagram build to use redo

b69bc464 · Nils Dagsson Moskopp · fe3eb28b · b69bc464 · b69bc464 · b69bc464
Unverified Commit b69bc464 authored 4 years ago by Nils Dagsson Moskopp
--- a/reform2-handbook/all.do
+++ b/reform2-handbook/all.do
+rm \
+ system.html \
+ system-diagram.svg \
+ system-diagram.pdf
+
+redo-ifchange \
+ system.html \
+ system-diagram.pdf
--- a/reform2-handbook/build.sh
+++ b/reform2-handbook/build.sh
-#!/bin/bash
+#!/bin/sh -eu

-function build {
-  dot -Tsvg system-diagram.dot -o system-diagram.svg
-  rsvg-convert -f pdf -o system-diagram.pdf system-diagram.svg
-
-  echo '<!DOCTYPE html><html lang="en"><meta charset="UTF-8">' >system.html
-  kramdown system.md >>system.html
-  echo '</html>' >>system.html
-  
-  sed -i 's/width="[^"]*"/width="100%"/' system-diagram.svg
-  sed -i 's/height="[^"]*"//' system-diagram.svg
-  sed -i 's/"Inter"/"Inter,Roboto,Helvetica,Helvetica Neue,Open Sans,Arial,sans-serif"/g' system-diagram.svg 
-}
-
-build
-
-while :
-do inotifywait -e modify -r *.dot *.md
-  build
+while redo; do
+ inotifywait -e modify -r *.dot *.md
 done
-
--- a/reform2-handbook/system-diagram.pdf.do
+++ b/reform2-handbook/system-diagram.pdf.do
+redo-ifchange system-diagram.svg
+rsvg-convert -f pdf -o "${3}" system-diagram.svg
--- a/reform2-handbook/system-diagram.svg.do
+++ b/reform2-handbook/system-diagram.svg.do
+redo-ifchange system-diagram.dot
+
+dot -Tsvg system-diagram.dot -o "${3}"
+
+sed -i 's/width="[^"]*"/width="100%"/' "${3}"
+sed -i 's/height="[^"]*"//' "${3}"
+sed -i 's/"Inter"/"Inter,Roboto,Helvetica,Helvetica Neue,Open Sans,Arial,sans-serif"/g' "${3}"
--- a/reform2-handbook/system.html.do
+++ b/reform2-handbook/system.html.do
+redo-ifchange \
+ system-diagram.svg \
+ system.md \
+
+echo '<!DOCTYPE html><html lang="en"><meta charset="UTF-8">'
+kramdown system.md
+echo '</html>'