From fa76b6fd2948057ee643c5d972a176eef580880b Mon Sep 17 00:00:00 2001 From: /dev/urandom Date: Sun, 31 May 2020 12:12:45 +0300 Subject: [PATCH] added a blog directory and a few pages --- Makefile | 10 ++++++++-- blogindex.sh | 26 ++++++++++++++++++++++++++ tpl/blog_footer.md | 0 tpl/blog_header.md | 9 +++++++++ 4 files changed, 43 insertions(+), 2 deletions(-) create mode 100755 blogindex.sh create mode 100644 tpl/blog_footer.md create mode 100644 tpl/blog_header.md diff --git a/Makefile b/Makefile index 74ba652..bae73ff 100644 --- a/Makefile +++ b/Makefile @@ -11,6 +11,8 @@ PNGS = $(patsubst $(PAGEDIR)/%,$(OUTDIR)/%,$(_PNGS)) _PAGES = $(shell find $(PAGEDIR) -name \*.md) PAGES_HTML = $(patsubst $(PAGEDIR)/%.md,$(OUTDIR)/%.html,$(_PAGES)) +_BLOG_PAGES = $(shell find $(PAGEDIR)/blog -name \*.md | grep -v $(PAGEDIR)/blog/index\.md$) + _DIRECTORIES = $(shell find $(PAGEDIR)/* -type d) DIRECTORIES = $(patsubst $(PAGEDIR)/, $(OUTDIR)/, $(_PAGES)) @@ -21,11 +23,15 @@ OUT_STATIC = $(patsubst static/%,out/%,$(_STATIC_FILES)) $(patsubst static/%.h,o .SUFFIXES: .PHONY: all upload -all: $(PAGES_HTML) $(OUT_STATIC) +all: $(OUTDIR)/blog/index.html $(PAGES_HTML) $(OUT_STATIC) upload: ./upload.sh +$(OUTDIR)/blog/index.html: $(_BLOG_PAGES) $(TPLDIR)/blog_header.md $(TPLDIR)/blog_footer.md $(TPLDIR)/default.tpl + @mkdir -p $(@D) + ./blogindex.sh | theme -C style -t $(TPLDIR)/default.tpl -p blog/index.html -o $@ + $(OUTDIR)/%.html: $(PAGEDIR)/%.md $(TPLDIR)/default.tpl @mkdir -p $(@D) theme -C style -t $(TPLDIR)/default.tpl -p $(patsubst $(OUTDIR)/%,%,$@) -o $@ $< @@ -39,4 +45,4 @@ $(OUTDIR)/%: static/% cp -r $< $@ clean: - rm -rf out/* + rm -rf out/* pages/blog/index.md diff --git a/blogindex.sh b/blogindex.sh new file mode 100755 index 0000000..a03a1a8 --- /dev/null +++ b/blogindex.sh @@ -0,0 +1,26 @@ +#!/bin/sh + +DIRECTORY="pages/blog" + +LASTUPLOAD=`stat -c %Y pages/blog/index.md 2>/dev/null` +if [[ -z $LASTUPLOAD ]]; then LASTUPLOAD=0; fi + +#echo "Last upload at $LASTUPLOAD" + +FILES=`ls $DIRECTORY/*.md -1ct --time=birth` + +cat tpl/blog_header.md + +for f in $FILES; do + MTIME=`stat -c %Y $f` + + TITLE=`head -n 1 $f` + TITLE=${TITLE#"% "} + + OUTPAGE=${f%.md}.html + OUTPAGE=/${OUTPAGE#pages/} + + echo " * [$TITLE]($OUTPAGE) (last update `date -d "@$MTIME" "+%Y-%m-%d %H:%M"`)" +done + +cat tpl/blog_footer.md diff --git a/tpl/blog_footer.md b/tpl/blog_footer.md new file mode 100644 index 0000000..e69de29 diff --git a/tpl/blog_header.md b/tpl/blog_header.md new file mode 100644 index 0000000..6ddb1ce --- /dev/null +++ b/tpl/blog_header.md @@ -0,0 +1,9 @@ +% rnd\'s blog +% /dev/urandom +% may 2020 + +This is a small sort of blog where I (very rarely) post stuff. Mostly small bits +of information that i'd like to remember in the future or make public. + +--- +