From 3ed23e0b64cf4a8ee4fa3293916f2cda0f0ffdec Mon Sep 17 00:00:00 2001
From: Sylvain Gauthier <syg@pedantic.software>
Date: Sat, 27 Mar 2021 14:33:45 +1100
Subject: fix rss/atom links

---
 blogit | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'blogit')

diff --git a/blogit b/blogit
index a0db362..b66a25f 100755
--- a/blogit
+++ b/blogit
@@ -176,8 +176,8 @@ blog/rss.xml: $(ARTICLES)
 	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' \
 			"`head -n 1 $$FILE`" \
-			"$(BLOG_URL_ROOT)/`basename $$FILE`.html" \
-			"$(BLOG_URL_ROOT)/`basename $$FILE`.html" \
+			"$(BLOG_URL_ROOT)/`basename $${FILE%.md}`.html" \
+			"$(BLOG_URL_ROOT)/`basename $${FILE%.md}`.html" \
 			"$$DATE" \
 			"`sed -n '1d;/^$$/{2{d;b};q};p' < $$FILE`"; \
 	done >> $@
@@ -192,8 +192,8 @@ blog/atom.xml: $(ARTICLES)
 	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' \
 			"`head -n 1 $$FILE`" \
-			"$(BLOG_URL_ROOT)/`basename $$FILE`.html" \
-			"$(BLOG_URL_ROOT)/`basename $$FILE`.html" \
+			"$(BLOG_URL_ROOT)/`basename $${FILE%.md}`.html" \
+			"$(BLOG_URL_ROOT)/`basename $${FILE%.md}`.html" \
 			"$$DATE" \
 			"`git log -n 1 --date="format:%Y-%m-%dT%H:%M:%SZ" --pretty=format:'%ad' -- "$$FILE"`" \
 			"$$AUTHOR" \
-- 
cgit v1.2.3