X-Git-Url: https://git.based.quest/?p=web-old.git;a=blobdiff_plain;f=blogit;h=c1063d11a0296e607d3b0b8259fb95ee53fb312e;hp=7cabbaafc34e655683815d4c8bf35328541fb6cc;hb=HEAD;hpb=7f10ed744edc523dad7426e20e43048320d4b1db

diff --git a/blogit b/blogit
index 7cabbaa..c1063d1 100755
--- a/blogit
+++ b/blogit
@@ -6,10 +6,11 @@ include config
 endif
 
 # The following can be configured in config
-BLOG_DATE_FORMAT_INDEX ?= %x
-BLOG_DATE_FORMAT ?= %x %X
+BLOG_DATE_FORMAT_INDEX ?= %d/%m/%Y
+BLOG_DATE_FORMAT ?= %d/%m/%Y %X
 BLOG_TITLE ?= blog
 BLOG_DESCRIPTION ?= blog
+BLOG_AUTHOR ?= John Doe
 BLOG_URL_ROOT ?= http://localhost/blog
 BLOG_FEED_MAX ?= 20
 BLOG_FEEDS ?= rss atom
@@ -65,6 +66,10 @@ blog/index.html: $(ARTICLES) $(TAGFILES) $(addprefix templates/,$(addsuffix .htm
 	mkdir -p blog
 	TITLE="$(BLOG_TITLE)"; \
 	export TITLE; \
+	DESCRIPTION="$(BLOG_DESCRIPTION)"; \
+	export DESCRIPTION; \
+	AUTHOR="$(BLOG_AUTHOR)"; \
+	export AUTHOR; \
 	envsubst < templates/header.html > $@; \
 	envsubst < templates/index_header.html >> $@; \
 	envsubst < templates/tag_list_header.html >> $@; \
@@ -103,8 +108,10 @@ tagpages: $(TAGFILES)
 
 blog/@%.html: $(TAGFILES) $(addprefix templates/,$(addsuffix .html,header tag_index_header tag_list_header tag_entry tag_separator tag_list_footer article_list_header article_entry article_separator article_list_footer tag_index_footer footer))
 	mkdir -p blog
-	TITLE="Articles tagged $*"; \
+	TITLE="$(BLOG_TITLE) - Articles tagged $*"; \
 	TAGS="$*"; \
+	AUTHOR=""; \
+	export AUTHOR; \
 	export TITLE; \
 	export TAGS; \
 	envsubst < templates/header.html > $@; \
@@ -129,9 +136,9 @@ blog/@%.html: $(TAGFILES) $(addprefix templates/,$(addsuffix .html,header tag_in
 
 blog/%.html: $(BLOG_SRC)/%.md $(addprefix templates/,$(addsuffix .html,header article_header article_footer footer))
 	mkdir -p blog
-	TITLE="$(shell head -n1 $<)"; \
+	TITLE=" $(BLOG_TITLE) - $(shell head -n1 $<)"; \
 	export TITLE; \
-	AUTHOR="$(shell git log -n 1 --reverse --format="%cn" -- "$<")"; \
+	AUTHOR="$(shell git log -n 1 --reverse --format="%an" -- "$<")"; \
 	export AUTHOR; \
 	DATE_POSTED="$(shell git log --diff-filter=A --date="format:$(BLOG_DATE_FORMAT)" --pretty=format:'%ad' -- "$<")"; \
 	export DATE_POSTED; \