Guest Entry - BieHDC - Fairphone 4 Review

[web-old.git] / blogit

diff --git a/blogit b/blogit
index cfc7017ed149c84e21740ac5346b1f1e3607a196..378b94b160da8775d2b3609f7f1c1120f1f14edd 100755 (executable)
--- a/blogit
+++ b/blogit
@@ -6,8 +6,8 @@ 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_URL_ROOT ?= http://localhost/blog
@@ -65,6 +65,8 @@ blog/index.html: $(ARTICLES) $(TAGFILES) $(addprefix templates/,$(addsuffix .htm
        mkdir -p blog
        TITLE="$(BLOG_TITLE)"; \
        export TITLE; \
+       DESCRIPTION="$(BLOG_DESCRIPTION)"; \
+       export DESCRIPTION; \
        envsubst < templates/header.html > $@; \
        envsubst < templates/index_header.html >> $@; \
        envsubst < templates/tag_list_header.html >> $@; \
@@ -103,7 +105,7 @@ 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="$*"; \
        export TITLE; \
        export TAGS; \
@@ -129,7 +131,7 @@ 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" -- "$<")"; \
        export AUTHOR; \
@@ -184,7 +186,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' >> $@
 
@@ -202,6 +204,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' >> $@