DeckPC style changes

[web-old.git] / blogit

diff --git a/blogit b/blogit
index 4f590f4ad53d34b7bb22ad1920f07bae41d726e9..c1063d11a0296e607d3b0b8259fb95ee53fb312e 100755 (executable)
--- 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; \
@@ -141,6 +148,8 @@ blog/%.html: $(BLOG_SRC)/%.md $(addprefix templates/,$(addsuffix .html,header ar
        export TAGS; \
        DESCRIPTION="$(shell grep -i '^; *description:' "$<" | cut -d: -f2-)"; \
        export DESCRIPTION; \
+       OG_IMAGE="$(shell grep -i '^; *og_image:' "$<" | cut -d: -f2-)"; \
+       export OG_IMAGE; \
        envsubst < templates/header.html > $@; \
        envsubst < templates/article_header.html >> $@; \
        sed -e 1d \
@@ -182,7 +191,7 @@ blog/rss.xml: $(ARTICLES)
                        "$(BLOG_URL_ROOT)/`basename $$FILE .md`.html" \
                        "$(BLOG_URL_ROOT)/`basename $$FILE .md`.html" \
                        "$$DATE" \
-                       "`sed -n 's/&/&amp;/;1d;/^$$/{2{d;b};q};p' < $$FILE`"; \
+                       "`cat "$$FILE" | grep ";description:" | cut -d: -f2-`"; \
        done >> $@
        printf '</channel>\n</rss>\n' >> $@
 
@@ -200,6 +209,6 @@ blog/atom.xml: $(ARTICLES)
                        "$$DATE" \
                        "`git log -n 1 --date="format:%Y-%m-%dT%H:%M:%SZ" --pretty=format:'%ad' -- "$$FILE"`" \
                        "$$AUTHOR" \
-                       "`sed -n 's/&/&amp;/;1d;/^$$/{2{d;b};q};p' < $$FILE`"; \
+                       "`cat "$$FILE" | grep ";description:" | cut -d: -f2-`"; \
        done >> $@
        printf '</feed>\n' >> $@