summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVolpeon <git@volpeon.ink>2020-12-22 23:13:50 +0100
committerVolpeon <git@volpeon.ink>2020-12-22 23:13:50 +0100
commit1aeb7cd21f7dba2891ff75b5f4b621d3de0f3ed5 (patch)
tree0ba60b5f176609578184aabf5f9ac075122cd80d
parentSwitched from cssnano to csso, added robots.txt, changed output dir (diff)
downloadvolpeon.ink-1aeb7cd21f7dba2891ff75b5f4b621d3de0f3ed5.tar.gz
volpeon.ink-1aeb7cd21f7dba2891ff75b5f4b621d3de0f3ed5.tar.bz2
volpeon.ink-1aeb7cd21f7dba2891ff75b5f4b621d3de0f3ed5.zip
Inlined simple scripts in the makefile
-rw-r--r--Makefile17
-rwxr-xr-xscripts/build_fonts.sh13
-rwxr-xr-xscripts/build_sass.sh3
-rwxr-xr-xscripts/serve.sh3
4 files changed, 14 insertions, 22 deletions
diff --git a/Makefile b/Makefile
index 53dfdb7..4f45201 100644
--- a/Makefile
+++ b/Makefile
@@ -1,13 +1,23 @@
1all: build 1all: build
2 2
3clean: 3clean:
4 @mkdir -p output
4 @rm -rf output/* 5 @rm -rf output/*
5 6
6build_fonts: clean 7build_fonts: clean
7 @scripts/build_fonts.sh 8 @pyftsubset assets/iosevka-term-ss09-regular.ttf \
9 --text-file='assets/glyphs.txt' \
10 --layout-features+=ss09,dlig \
11 --flavor='woff2' \
12 --output-file='output/iosevka-term-ss09-regular.woff2'
13 @pyftsubset assets/iosevka-term-ss09-bold.ttf \
14 --text-file='assets/glyphs.txt' \
15 --layout-features+=ss09,dlig \
16 --flavor='woff2' \
17 --output-file='output/iosevka-term-ss09-bold.woff2'
8 18
9build_sass: clean 19build_sass: clean
10 @scripts/build_sass.sh 20 @sassc assets/style.scss | node_modules/.bin/csso > output/style.css
11 21
12build_content: clean 22build_content: clean
13 @scripts/build_content.sh 23 @scripts/build_content.sh
@@ -16,6 +26,7 @@ copy_static: clean
16 @cp -r static/* output/ 26 @cp -r static/* output/
17 27
18build: build_fonts build_sass build_content copy_static 28build: build_fonts build_sass build_content copy_static
29# @pigz -R -k -9 -- `find output -type f -iregex '.*\\.\\(css\\|js\\|json\\|html\\|xml\\|txt\\|svg\\|ico\\)'`
19 30
20watch_sass: build 31watch_sass: build
21 @scripts/watch_sass.sh 32 @scripts/watch_sass.sh
@@ -26,7 +37,7 @@ watch_content: build
26watch: watch_sass watch_content 37watch: watch_sass watch_content
27 38
28serve_only: build 39serve_only: build
29 @scripts/serve.sh 40 @python -m http.server --bind 127.0.0.1 --directory output
30 41
31serve: watch serve_only 42serve: watch serve_only
32 43
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 @@
1#!/bin/bash
2
3pyftsubset assets/iosevka-term-ss09-regular.ttf \
4 --text-file='assets/glyphs.txt' \
5 --layout-features+=ss09,dlig \
6 --flavor='woff2' \
7 --output-file='output/iosevka-term-ss09-regular.woff2'
8
9pyftsubset assets/iosevka-term-ss09-bold.ttf \
10 --text-file='assets/glyphs.txt' \
11 --layout-features+=ss09,dlig \
12 --flavor='woff2' \
13 --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 @@
1#!/bin/bash
2
3sassc 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 @@
1#!/bin/bash
2
3python -m http.server --bind 127.0.0.1 --directory output