From 2c8bd3d6207202f25898d113cf7937384b37b6a9 Mon Sep 17 00:00:00 2001 From: Daniel Date: Tue, 23 Jun 2020 17:06:38 +0200 Subject: [PATCH] markdowns index.html --- Makefile | 13 +++++++++---- inc/head.template | 3 +-- index.html | 32 -------------------------------- index.md | 7 +++++++ 4 files changed, 17 insertions(+), 38 deletions(-) delete mode 100644 index.html create mode 100644 index.md diff --git a/Makefile b/Makefile index 9e69204..54734c1 100644 --- a/Makefile +++ b/Makefile @@ -1,12 +1,12 @@ # markdown sources posts=$(patsubst %.md,build/%.html,$(wildcard blog/*.md)) # static sources -S=index.html img/ +S=img/ -all: blog $S $(posts) +all: build/index.html blog $S cp -av $S build/ -blog: build/blog/ +blog: build/blog/ $(posts) build/: mkdir -p $@ @@ -14,7 +14,12 @@ build/: build/blog/: build/ mkdir -p $@ -build/blog/%.html: blog/%.md build/ +build/index.html: index.md build/ inc/head.template inc/foot.template + sed "s/__TITLE__/thefekete.net/; /__DATE__/d" inc/head.template >$@ + markdown index.md >>$@ + cat inc/foot.template >>$@ + +build/blog/%.html: blog/%.md build/ inc/head.template inc/foot.template @# `pacman -S discount` for `markdown` bin/blog.awk $< >$@ diff --git a/inc/head.template b/inc/head.template index d7f46b1..0bc6be7 100644 --- a/inc/head.template +++ b/inc/head.template @@ -20,8 +20,7 @@ Thingiverse

__DATE__

TITLE

diff --git a/index.html b/index.html deleted file mode 100644 index 05c4a80..0000000 --- a/index.html +++ /dev/null @@ -1,32 +0,0 @@ - - - - - thefekete.net - - - - - -

- -

thefekete.net

This is the first sentence.

- Special thanks to Luke Smith for the - last little kick to finally get my site back up after more than - - 8 years of down time - . -

- - \ No newline at end of file diff --git a/index.md b/index.md new file mode 100644 index 0000000..5fee029 --- /dev/null +++ b/index.md @@ -0,0 +1,7 @@ +![Trogdor](img/trogdor.png) + +This is the first sentence. + +Special thanks to [Luke Smith](http://lukesmith.xyz) for the +last little kick to finally get my site back up after more than +[8 years of down time](https://web.archive.org/web/20121029100909/http://thefekete.net/) -- 2.20.1