Changes for working in a cabal sandbox

2 files changed, 10 insertions, 3 deletions

diff --git a/default.html.do b/default.html.do
index c880f0b..b7e46ae 100644
--- a/default.html.do
+++ b/default.html.do
@@ -1,13 +1,19 @@
 redo-ifchange $2.md build/tex-filter.hs build/template.html5
 
+texfilter() {
+                runhaskell -package-conf=$(find .cabal-sandbox -maxdepth 1 -iname '*.conf.d' | head -n 1)  build/tex-filter.hs $@
+}
+
 CSS=/style.css
 
-pandoc -t json $2.md | build/tex-filter.hs "$(pwd)" 2>&1 >/dev/null \
+pandoc -t json $2.md | texfilter "$(pwd)" \
     | while read -r x; do
+                      [[ -z "${x}" ]] && continue
           echo $x/image.svg
+                                        echo $x/image.svg >&2
       done \
     | xargs -d '\n' redo-ifchange
 
 pandoc -S -f markdown -t json $2.md \
-        | build/tex-filter.hs "$(pwd)" 2>/dev/null \
+        | texfilter "$(pwd)" \
         | pandoc --template=build/template.html5 --base-header-level=3 --standalone --email-obfuscation=none -f json -t html5 -c $CSS >$3 2>/dev/null
diff --git a/htdocs.do b/htdocs.do
index 8470901..6e70576 100644
--- a/htdocs.do
+++ b/htdocs.do
@@ -1,2 +1,3 @@
 redo-ifchange all
-rsync -Rav --delete style.css *.html lists/*.html posts/*.html tex/*/*.svg htdocs/ >&2
+find . \( -name '*.html' -or -name '*.css' -or -name '*.svg' \) -and -not \( -path '*/.cabal-sandbox/*' -or -path '*/htdocs/*' -or -path '*/build/*' \) -print0 | \
+xargs -0 -I '{}' -- rsync -Rav --delete '{}' htdocs >&2