From c6543c3669b79ef3dae6c00bcabce8573205e1a2 Mon Sep 17 00:00:00 2001 From: Fabien Freling Date: Tue, 31 Aug 2021 13:58:44 +0200 Subject: [PATCH] update build scripts --- Tuprules.tup | 9 +++++---- justfile | 3 +++ 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/Tuprules.tup b/Tuprules.tup index 99e66b7..744a6ce 100644 --- a/Tuprules.tup +++ b/Tuprules.tup @@ -1,15 +1,16 @@ &root = . +&build_root = build HTML_TEMPLATE = main.html !html = | &(root)/templates/footer.html \ - |> ^ html %f^ \ + |> ^b html %f^ \ pandoc --from markdown --to html \ --template=&(root)/templates/$(HTML_TEMPLATE) \ --css &(root)/css/style.css \ --include-in-header=&(root)/templates/header.html \ --include-before-body=&(root)/templates/nav.html \ - --include-after-body=&(root)/templates/footer.html \ + --include-after-body=&(build_root)/templates/footer.html \ %f | sed 's|%%webRoot%%|&(root)|g' > %o \ |> %B.html @@ -20,5 +21,5 @@ HTML_TEMPLATE = main.html !compress_pdf = |> ps2pdf %f %o |> JPG_OPT = -quality 80 -strip -interlace Plane -!blur_mini = |> convert %f -resize 400x400 -blur 0x8 $(JPG_OPT) %o |> blur_mini.jpg -!thumbnail = |> convert %f -resize 200x200 $(JPG_OPT) %o |> +!blur_mini = |> ^ %f -> blur mini^ convert %f -resize 400x400 -blur 0x8 $(JPG_OPT) %o |> blur_mini.jpg +!thumbnail = |> ^ %f -> thumbnail^ convert %f -resize 200x200 $(JPG_OPT) %o |> diff --git a/justfile b/justfile index 833f577..776e7d8 100644 --- a/justfile +++ b/justfile @@ -1,6 +1,9 @@ # vim: set ft=make : root := `pwd` +setup-ubuntu: + sudo apt install fuse3 pandoc + # Build static website build: tup build