diff --git a/.gitignore b/.gitignore index 95757f2..474022f 100644 --- a/.gitignore +++ b/.gitignore @@ -4,4 +4,5 @@ css/code.css pgvv/ all_chars.txt **/fonts/**/*-Subset.* -woff2/ \ No newline at end of file +woff2/ +**/serve_* diff --git a/acl.cool/site/assets/EasySalsa.pdf.draft b/acl.cool/site/assets/EasySalsa.pdf.draft new file mode 100644 index 0000000..060b56d Binary files /dev/null and b/acl.cool/site/assets/EasySalsa.pdf.draft differ diff --git a/build.sh b/build.sh index 675d5f4..b637f49 100755 --- a/build.sh +++ b/build.sh @@ -1,8 +1,14 @@ -#!/bin/bash +#! /usr/bin/env nix-shell +#! nix-shell -i bash --pure +#! nix-shell -p bash harfbuzz soupault woff2 jotdown python3 --pure -./deps.sh || exit $? - -find acl.cool/serve/ ytheleus.org/serve/ -type f -mmin +11 -delete +if ! [[ -d pgvv/ ]]; then + python3 -m venv pgvv + source ./pgvv/bin/activate + python3 -m pip install --upgrade pip + pip install --upgrade pygments + deactivate +fi function soup_config { rm soupault.toml @@ -16,7 +22,7 @@ find acl.cool/site/ ytheleus.org/site/ -type f \( -name '*.dj' -o -name '*.html' cat common_chars.txt >>all_chars.txt for font in fonts/JuliaMono/*{-Light,-Regular,-SemiBold}{,Italic}.woff2; do - ./woff2/woff2_decompress "$font" + woff2_decompress "$font" ttf_font="${font%.woff2}.ttf" subset_ttf="${ttf_font%.ttf}-Subset.ttf" @@ -26,7 +32,7 @@ for font in fonts/JuliaMono/*{-Light,-Regular,-SemiBold}{,Italic}.woff2; do --layout-features='*' \ --passthrough-tables - ./woff2/woff2_compress "$subset_ttf" + woff2_compress "$subset_ttf" rm "$subset_ttf" "$ttf_font" done @@ -41,7 +47,7 @@ for font in \ --layout-features='*' \ --passthrough-tables - ./woff2/woff2_compress "$subset_ttf" + woff2_compress "$subset_ttf" rm "$subset_ttf" done @@ -52,10 +58,20 @@ pygmentize -f html -S algol_nu | grep -v 'line-height' >css/code.css builtin pushd acl.cool soup_config soupault + +NEXT_DIR="serve_$(date +%s)" +cp -a serve "$NEXT_DIR" +ln -sfn "$NEXT_DIR" serve_ + popd builtin pushd ytheleus.org soup_config soupault + +NEXT_DIR="serve_$(date +%s)" +cp -a serve "$NEXT_DIR" +ln -sfn "$NEXT_DIR" serve_ + popd deactivate diff --git a/css/index.css b/css/index.css deleted file mode 100644 index 753f81a..0000000 --- a/css/index.css +++ /dev/null @@ -1,7 +0,0 @@ -@import url(fonts.css); - -@import url(looks.css); - -@import url(layout.css); - -@import url(code.css); \ No newline at end of file diff --git a/deps.sh b/deps.sh deleted file mode 100755 index 8401ea6..0000000 --- a/deps.sh +++ /dev/null @@ -1,52 +0,0 @@ -#!/bin/sh - -if ! [[ -d pgvv/ ]]; then - python3 -m venv pgvv - source ./pgvv/bin/activate - python3 -m pip install --upgrade pip - pip install --upgrade pygments - # pip install --upgrade fonttools - # pip install --upgrade brotli - deactivate -fi - -which hb-subset -if ! [[ $? == 0 ]]; then - echo 'please install hb-subset (provided by harfbuzz-devel on RedHat)' - exit 6 -fi - -which opam 2> /dev/null -if [[ $? == 0 ]]; then - opam install -y soupault -else - echo 'failed to install soupault with opam' >&2 - exit 2 -fi - -which cargo 2> /dev/null -if [[ $? == 0 ]]; then - cargo install jotdown -else - echo 'failed to install jotdown with cargo' - exit 3 -fi - -which git 2> /dev/null -if ! [[ $? == 0 ]]; then - echo 'you need git' - exit 4 -fi - -which cc 2> /dev/null -if ! [[ $? == 0 ]]; then - echo 'you need a C compiler' - exit 5 -fi - -if ! [[ -d woff2/ ]]; then - git clone https://github.com/mobotsar/woff2.git --recursive || exit 7 - builtin pushd woff2 - make clean all || exit 8 - popd -fi \ No newline at end of file diff --git a/shared_templates/main.html b/shared_templates/main.html index ac13523..8303b84 100644 --- a/shared_templates/main.html +++ b/shared_templates/main.html @@ -4,7 +4,10 @@