From 1aeb7cd21f7dba2891ff75b5f4b621d3de0f3ed5 Mon Sep 17 00:00:00 2001 From: Volpeon Date: Tue, 22 Dec 2020 23:13:50 +0100 Subject: Inlined simple scripts in the makefile --- Makefile | 17 ++++++++++++++--- scripts/build_fonts.sh | 13 ------------- scripts/build_sass.sh | 3 --- scripts/serve.sh | 3 --- 4 files changed, 14 insertions(+), 22 deletions(-) delete mode 100755 scripts/build_fonts.sh delete mode 100755 scripts/build_sass.sh delete mode 100755 scripts/serve.sh diff --git a/Makefile b/Makefile index 53dfdb7..4f45201 100644 --- a/Makefile +++ b/Makefile @@ -1,13 +1,23 @@ all: build clean: + @mkdir -p output @rm -rf output/* build_fonts: clean - @scripts/build_fonts.sh + @pyftsubset assets/iosevka-term-ss09-regular.ttf \ + --text-file='assets/glyphs.txt' \ + --layout-features+=ss09,dlig \ + --flavor='woff2' \ + --output-file='output/iosevka-term-ss09-regular.woff2' + @pyftsubset assets/iosevka-term-ss09-bold.ttf \ + --text-file='assets/glyphs.txt' \ + --layout-features+=ss09,dlig \ + --flavor='woff2' \ + --output-file='output/iosevka-term-ss09-bold.woff2' build_sass: clean - @scripts/build_sass.sh + @sassc assets/style.scss | node_modules/.bin/csso > output/style.css build_content: clean @scripts/build_content.sh @@ -16,6 +26,7 @@ copy_static: clean @cp -r static/* output/ build: build_fonts build_sass build_content copy_static +# @pigz -R -k -9 -- `find output -type f -iregex '.*\\.\\(css\\|js\\|json\\|html\\|xml\\|txt\\|svg\\|ico\\)'` watch_sass: build @scripts/watch_sass.sh @@ -26,7 +37,7 @@ watch_content: build watch: watch_sass watch_content serve_only: build - @scripts/serve.sh + @python -m http.server --bind 127.0.0.1 --directory output serve: watch serve_only diff --git a/scripts/build_fonts.sh b/scripts/build_fonts.sh deleted file mode 100755 index 145dfef..0000000 --- a/scripts/build_fonts.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/bash - -pyftsubset assets/iosevka-term-ss09-regular.ttf \ - --text-file='assets/glyphs.txt' \ - --layout-features+=ss09,dlig \ - --flavor='woff2' \ - --output-file='output/iosevka-term-ss09-regular.woff2' - -pyftsubset assets/iosevka-term-ss09-bold.ttf \ - --text-file='assets/glyphs.txt' \ - --layout-features+=ss09,dlig \ - --flavor='woff2' \ - --output-file='output/iosevka-term-ss09-bold.woff2' diff --git a/scripts/build_sass.sh b/scripts/build_sass.sh deleted file mode 100755 index f972859..0000000 --- a/scripts/build_sass.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash - -sassc assets/style.scss | node_modules/.bin/csso > output/style.css diff --git a/scripts/serve.sh b/scripts/serve.sh deleted file mode 100755 index 9952373..0000000 --- a/scripts/serve.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash - -python -m http.server --bind 127.0.0.1 --directory output -- cgit v1.2.3-70-g09d2