yogsototh/her.esy.fun
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

fix index script

Browse source
This commit is contained in:
Yann Esposito (Yogsototh) 2021-05-08 10:33:02 +02:00
parent fb993d8928
commit 9fdc163fc5
Signed by untrusted user who does not match committer: yogsototh
GPG key ID: 7B19A4C650D59646
2 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
Makefile
View file

@ -4,7 +4,7 @@
# From https://github.com/fcanas/bake/blob/master/Makefile # From https://github.com/fcanas/bake/blob/master/Makefile
# Finally https://www.arsouyes.org/blog/2017/10_Static_website/ # Finally https://www.arsouyes.org/blog/2017/10_Static_website/
all: fast all: site
SRC_DIR ?= src SRC_DIR ?= src
DST_DIR ?= _site DST_DIR ?= _site
CACHE_DIR ?= .cache CACHE_DIR ?= .cache
@ -44,17 +44,19 @@ $(DST_DIR)/%.html: $(SRC_DIR)/%.org $(TEMPLATE)
minify --mime text/html $@.tmp > $@ minify --mime text/html $@.tmp > $@
@rm $@.tmp @rm $@.tmp
ALL += $(DST_PANDOC_FILES) ALL += $(DST_PANDOC_FILES)
html: $(DST_PANDOC_FILES)
# HTML INDEX # HTML INDEX
HTML_INDEX := $(DST_DIR)/index.html HTML_INDEX := $(DST_DIR)/index.html
MKINDEX := engine/mk-index.sh MKINDEX := engine/mk-index.sh
$(HTML_INDEX): $(DST_PANDOC_FILES) $(MKINDEX) $(HTML_INDEX): $(DST_PANDOC_FILES) $(MKINDEX) $(TEMPLATE)
@mkdir -p $(DST_DIR) @mkdir -p $(DST_DIR)
$(MKINDEX) $(MKINDEX)
ALL += $(HTML_INDEX) ALL += $(HTML_INDEX)
index: $(HTML_INDEX)
# RSS # RSS
SRC_POSTS_DIR ?= $(SRC_DIR)/posts SRC_POSTS_DIR ?= $(SRC_DIR)/posts
DST_POSTS_DIR ?= $(DST_DIR)/posts DST_POSTS_DIR ?= $(DST_DIR)/posts
@ -89,6 +91,7 @@ $(DST_DIR)/%.gmi: $(SRC_DIR)/%.org $(GMI) engine/org2gemini_step1.sh
@mkdir -p $(dir $@) @mkdir -p $(dir $@)
$(GMI) "$<" "$@" $(GMI) "$<" "$@"
ALL += $(DST_GMI_FILES) ALL += $(DST_GMI_FILES)
gmi: $(DST_GMI_FILES)
# GEMINI INDEX # GEMINI INDEX
GMI_INDEX := $(DST_DIR)/index.gmi GMI_INDEX := $(DST_DIR)/index.gmi
@ -97,6 +100,7 @@ $(GMI_INDEX): $(DST_GMI_FILES) $(MK_GMI_INDEX)
@mkdir -p $(DST_DIR) @mkdir -p $(DST_DIR)
$(MK_GMI_INDEX) $(MK_GMI_INDEX)
ALL += $(GMI_INDEX) ALL += $(GMI_INDEX)
gmi-index: $(GMI_INDEX)
# RSS # RSS
GEM_ATOM := $(DST_DIR)/gem-atom.xml GEM_ATOM := $(DST_DIR)/gem-atom.xml
@ -104,6 +108,7 @@ MK_GEMINI_ATOM := engine/mk-gemini-atom.sh
$(GEM_ATOM): $(DST_GMI_FILES) $(MK_GEMINI_ATOM) $(GEM_ATOM): $(DST_GMI_FILES) $(MK_GEMINI_ATOM)
$(MK_GEMINI_ATOM) $(MK_GEMINI_ATOM)
ALL += $(GEM_ATOM) ALL += $(GEM_ATOM)
gmi-atom: $(GMI_ATOM)
gemini: $(DST_GMI_FILES) $(GMI_INDEX) $(GEM_ATOM) gemini: $(DST_GMI_FILES) $(GMI_INDEX) $(GEM_ATOM)
@ -128,14 +133,15 @@ $(DST_DIR)/%.png: $(SRC_DIR)/%.png
convert "$<" -quality 50 -resize 800x800\> "$@" convert "$<" -quality 50 -resize 800x800\> "$@"
ALL += $(DST_IMG_FILES) ALL += $(DST_IMG_FILES)
img: $(DST_IMG_FILES)
# DEPLOY # DEPLOY
site: $(ALL)
deploy: $(ALL) deploy: $(ALL)
engine/sync.sh # deploy to her.esy.fun engine/sync.sh # deploy to her.esy.fun
engine/ye-com-fastpublish.hs # deploy to yannesposito.com (via github pages) engine/ye-com-fastpublish.hs # deploy to yannesposito.com (via github pages)
fast: $(ALL)
.PHONY: clean .PHONY: clean
clean: clean:

2
engine/mk-index.sh
View file

@ -134,7 +134,7 @@ body=$(< $tmpdir/index)
date=$(LC_TIME=en_US date +'%Y-%m-%d') date=$(LC_TIME=en_US date +'%Y-%m-%d')
# the pandoc templates use $x$ format, we replace it by just $x # the pandoc templates use $x$ format, we replace it by just $x
# to be used with envsubst # to be used with envsubst
template=$(< templates/post.html | perl -pe 's#(\$[^\$]*)\$#$1#g' ) template=$(< templates/post.html | sed 's/\$header-includes\$//' | perl -pe 's#(\$[^\$]*)\$#$1#g' )
{ {
export title export title
export author export author