diff --git a/Tuprules.tup b/Tuprules.tup index 744a6ce..99e66b7 100644 --- a/Tuprules.tup +++ b/Tuprules.tup @@ -1,16 +1,15 @@ &root = . -&build_root = build HTML_TEMPLATE = main.html !html = | &(root)/templates/footer.html \ - |> ^b html %f^ \ + |> ^ 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=&(build_root)/templates/footer.html \ + --include-after-body=&(root)/templates/footer.html \ %f | sed 's|%%webRoot%%|&(root)|g' > %o \ |> %B.html @@ -21,5 +20,5 @@ HTML_TEMPLATE = main.html !compress_pdf = |> ps2pdf %f %o |> JPG_OPT = -quality 80 -strip -interlace Plane -!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 |> +!blur_mini = |> convert %f -resize 400x400 -blur 0x8 $(JPG_OPT) %o |> blur_mini.jpg +!thumbnail = |> convert %f -resize 200x200 $(JPG_OPT) %o |> diff --git a/justfile b/justfile index 776e7d8..833f577 100644 --- a/justfile +++ b/justfile @@ -1,9 +1,6 @@ # vim: set ft=make : root := `pwd` -setup-ubuntu: - sudo apt install fuse3 pandoc - # Build static website build: tup build diff --git a/templates/nav.html b/templates/nav.html index 3e2ab4a..ca41a64 100644 --- a/templates/nav.html +++ b/templates/nav.html @@ -5,4 +5,3 @@ Articles About -