Merge pull request #167 from sylGauthier/syg/master

fix RSS titles, put whole recipe in description
This commit is contained in:
Luke Smith 2021-03-15 08:22:12 -04:00 committed by GitHub
commit 053356d058
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -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"; \ 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 \ done | sort -k2nr | head -n $(BLOG_FEED_MAX) | cut -d" " -f1,3- | while IFS=" " read -r FILE DATE; do \
printf '<item>\n<title>%s</title>\n<link>%s</link>\n<guid>%s</guid>\n<pubDate>%s</pubDate>\n<description>%s</description>\n</item>\n' \ printf '<item>\n<title>%s</title>\n<link>%s</link>\n<guid>%s</guid>\n<pubDate>%s</pubDate>\n<description>%s</description>\n</item>\n' \
"`head -n 1 $$FILE`" \ "`head -n 1 $$FILE | sed 's/^# //'`" \
"$(BLOG_URL_ROOT)/`basename $$FILE`.html" \ "$(BLOG_URL_ROOT)/`basename $$FILE`.html" \
"$(BLOG_URL_ROOT)/`basename $$FILE`.html" \ "$(BLOG_URL_ROOT)/`basename $$FILE`.html" \
"$$DATE" \ "$$DATE" \
"`sed -n '1d;/^$$/{2{d;b};q};p' < $$FILE`"; \ "`tail -n+3 < $$FILE`"; \
done >> $@ done >> $@
printf '</channel>\n</rss>\n' >> $@ printf '</channel>\n</rss>\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"; \ 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 \ done | sort -k2nr | head -n $(BLOG_FEED_MAX) | cut -d" " -f1,3- | while IFS=" " read -r FILE DATE AUTHOR; do \
printf '<entry>\n<title type="text">%s</title>\n<link rel="alternate" type="text/html" href="%s"/>\n<id>%s</id>\n<published>%s</published>\n<updated>%s</updated>\n<author><name>%s</name></author>\n<summary type="text">%s</summary>\n</entry>\n' \ printf '<entry>\n<title type="text">%s</title>\n<link rel="alternate" type="text/html" href="%s"/>\n<id>%s</id>\n<published>%s</published>\n<updated>%s</updated>\n<author><name>%s</name></author>\n<summary type="text">%s</summary>\n</entry>\n' \
"`head -n 1 $$FILE`" \ "`head -n 1 $$FILE | sed 's/^# //'`" \
"$(BLOG_URL_ROOT)/`basename $$FILE`.html" \ "$(BLOG_URL_ROOT)/`basename $$FILE`.html" \
"$(BLOG_URL_ROOT)/`basename $$FILE`.html" \ "$(BLOG_URL_ROOT)/`basename $$FILE`.html" \
"$$DATE" \ "$$DATE" \
"`git log -n 1 --date="format:%Y-%m-%dT%H:%M:%SZ" --pretty=format:'%ad' -- "$$FILE"`" \ "`git log -n 1 --date="format:%Y-%m-%dT%H:%M:%SZ" --pretty=format:'%ad' -- "$$FILE"`" \
"$$AUTHOR" \ "$$AUTHOR" \
"`sed -n '1d;/^$$/{2{d;b};q};p' < $$FILE`"; \ "`tail -n+3 $$FILE`"; \
done >> $@ done >> $@
printf '</feed>\n' >> $@ printf '</feed>\n' >> $@