From 93e99588c6d95339387d27d3912c59bb2e7824b4 Mon Sep 17 00:00:00 2001 From: Sylvain Gauthier Date: Mon, 15 Mar 2021 18:51:16 +1100 Subject: [PATCH] fix RSS titles, put whole recipe in description --- Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index f632891..13d363e 100644 --- a/Makefile +++ b/Makefile @@ -168,11 +168,11 @@ blog/rss.xml: $(ARTICLES) git log -n 1 --diff-filter=A --date="format:%s %a, %d %b %Y %H:%M:%S %z" --pretty=format:'%ad%n' -- "$$f"; \ done | sort -k2nr | head -n $(BLOG_FEED_MAX) | cut -d" " -f1,3- | while IFS=" " read -r FILE DATE; do \ printf '\n%s\n%s\n%s\n%s\n%s\n\n' \ - "`head -n 1 $$FILE`" \ + "`head -n 1 $$FILE | sed 's/^# //'`" \ "$(BLOG_URL_ROOT)/`basename $$FILE`.html" \ "$(BLOG_URL_ROOT)/`basename $$FILE`.html" \ "$$DATE" \ - "`sed -n '1d;/^$$/{2{d;b};q};p' < $$FILE`"; \ + "`tail -n+3 < $$FILE`"; \ done >> $@ printf '\n\n' >> $@ @@ -184,13 +184,13 @@ blog/atom.xml: $(ARTICLES) git log -n 1 --diff-filter=A --date="format:%s %Y-%m-%dT%H:%M:%SZ" --pretty=format:'%ad %aN%n' -- "$$f"; \ done | sort -k2nr | head -n $(BLOG_FEED_MAX) | cut -d" " -f1,3- | while IFS=" " read -r FILE DATE AUTHOR; do \ printf '\n%s\n\n%s\n%s\n%s\n%s\n%s\n\n' \ - "`head -n 1 $$FILE`" \ + "`head -n 1 $$FILE | sed 's/^# //'`" \ "$(BLOG_URL_ROOT)/`basename $$FILE`.html" \ "$(BLOG_URL_ROOT)/`basename $$FILE`.html" \ "$$DATE" \ "`git log -n 1 --date="format:%Y-%m-%dT%H:%M:%SZ" --pretty=format:'%ad' -- "$$FILE"`" \ "$$AUTHOR" \ - "`sed -n '1d;/^$$/{2{d;b};q};p' < $$FILE`"; \ + "`tail -n+3 $$FILE`"; \ done >> $@ printf '\n' >> $@