From 0190dd163692585f3da3bf642e258b46df873a85 Mon Sep 17 00:00:00 2001 From: Harrison Wong Date: Mon, 15 Mar 2021 11:36:26 -0400 Subject: fix rss links --- Makefile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 8a358c1..2d71560 100644 --- a/Makefile +++ b/Makefile @@ -169,8 +169,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 '\n%s\n%s\n%s\n%s\n%s\n\n' \ "`head -n 1 $$FILE | sed 's/^# //'`" \ - "$(BLOG_URL_ROOT)/`basename $$FILE`.html" \ - "$(BLOG_URL_ROOT)/`basename $$FILE`.html" \ + "$(BLOG_URL_ROOT)`basename $$FILE | sed 's/\.md/\.html/'`" \ + "$(BLOG_URL_ROOT)`basename $$FILE | sed 's/\.md/\.html/'`" \ "$$DATE" \ "`tail -n+3 < $$FILE`"; \ done >> $@ @@ -178,15 +178,15 @@ blog/rss.xml: $(ARTICLES) blog/atom.xml: $(ARTICLES) printf '\n\n%s\n%s\n%s\n\n%s\n\n' \ - "$(BLOG_TITLE)" "$(BLOG_DESCRIPTION)" "$(shell date +%Y-%m-%dT%H:%M:%SZ)" "$(BLOG_URL_ROOT)" "$(BLOG_URL_ROOT)/atom.xml" "$(BLOG_URL_ROOT)/atom.xml" > $@ + "$(BLOG_TITLE)" "$(BLOG_DESCRIPTION)" "$(shell date +%Y-%m-%dT%H:%M:%SZ)" "$(BLOG_URL_ROOT)" "$(BLOG_URL_ROOT)atom.xml" "$(BLOG_URL_ROOT)/atom.xml" > $@ for f in $(ARTICLES); do \ printf '%s ' "$$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 \ printf '\n%s\n\n%s\n%s\n%s\n%s\n%s\n\n' \ "`head -n 1 $$FILE | sed 's/^# //'`" \ - "$(BLOG_URL_ROOT)/`basename $$FILE`.html" \ - "$(BLOG_URL_ROOT)/`basename $$FILE`.html" \ + "$(BLOG_URL_ROOT)`basename $$FILE | sed 's/\.md/\.html/'`" \ + "$(BLOG_URL_ROOT)`basename $$FILE | sed 's/\.md/\.html/'`" \ "$$DATE" \ "`git log -n 1 --date="format:%Y-%m-%dT%H:%M:%SZ" --pretty=format:'%ad' -- "$$FILE"`" \ "$$AUTHOR" \ -- cgit v1.2.3 From d19ee79c567d32dff827a73b72c94454058974d0 Mon Sep 17 00:00:00 2001 From: Luke Smith Date: Tue, 16 Mar 2021 22:11:56 -0400 Subject: use html via markdown in RSS --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 2d71560..6998070 100644 --- a/Makefile +++ b/Makefile @@ -172,7 +172,7 @@ blog/rss.xml: $(ARTICLES) "$(BLOG_URL_ROOT)`basename $$FILE | sed 's/\.md/\.html/'`" \ "$(BLOG_URL_ROOT)`basename $$FILE | sed 's/\.md/\.html/'`" \ "$$DATE" \ - "`tail -n+3 < $$FILE`"; \ + "`markdown < $$FILE`"; \ done >> $@ printf '\n\n' >> $@ -- cgit v1.2.3 From c33de032376d7174ac0a0679e8ee9d196ad8ae79 Mon Sep 17 00:00:00 2001 From: Luke Smith Date: Tue, 16 Mar 2021 22:16:18 -0400 Subject: CDATA for html rss --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 6998070..fc124d5 100644 --- a/Makefile +++ b/Makefile @@ -167,7 +167,7 @@ blog/rss.xml: $(ARTICLES) printf '%s ' "$$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 \ - printf '\n%s\n%s\n%s\n%s\n%s\n\n' \ + printf '\n%s\n%s\n%s\n%s\n\n\n' \ "`head -n 1 $$FILE | sed 's/^# //'`" \ "$(BLOG_URL_ROOT)`basename $$FILE | sed 's/\.md/\.html/'`" \ "$(BLOG_URL_ROOT)`basename $$FILE | sed 's/\.md/\.html/'`" \ -- cgit v1.2.3 From 673b2fcaa5a4029df0a03aefe8354dd54ac110aa Mon Sep 17 00:00:00 2001 From: Luke Smith Date: Tue, 16 Mar 2021 22:25:56 -0400 Subject: fix atom feed too --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index fc124d5..3259a93 100644 --- a/Makefile +++ b/Makefile @@ -183,14 +183,14 @@ blog/atom.xml: $(ARTICLES) printf '%s ' "$$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 \ - printf '\n%s\n\n%s\n%s\n%s\n%s\n%s\n\n' \ + printf '\n%s\n\n%s\n%s\n%s\n%s\n\n\n' \ "`head -n 1 $$FILE | sed 's/^# //'`" \ "$(BLOG_URL_ROOT)`basename $$FILE | sed 's/\.md/\.html/'`" \ "$(BLOG_URL_ROOT)`basename $$FILE | sed 's/\.md/\.html/'`" \ "$$DATE" \ "`git log -n 1 --date="format:%Y-%m-%dT%H:%M:%SZ" --pretty=format:'%ad' -- "$$FILE"`" \ "$$AUTHOR" \ - "`tail -n+3 $$FILE`"; \ + "`markdown < $$FILE`"; \ done >> $@ printf '\n' >> $@ -- cgit v1.2.3 From 321bddab3ba3f9311b57629535f7856a1f0f03be Mon Sep 17 00:00:00 2001 From: Sylvain Gauthier Date: Wed, 17 Mar 2021 13:50:41 +1100 Subject: consolidate tag parsing Allow punctuation signs to separate tags instead of just space --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 3259a93..986aca3 100644 --- a/Makefile +++ b/Makefile @@ -59,7 +59,7 @@ config: tags/%: $(BLOG_SRC)/%.md mkdir -p tags - grep -i '^; *tags:' "$<" | cut -d: -f2- | sed 's/ */\n/g' | sed '/^$$/d' | sort -u > $@ + grep -ih '^; *tags:' "$<" | cut -d: -f2- | tr '[:punct:]' ' ' | sed 's/ */\n/g' | sed '/^$$/d' | sort -u > $@ blog/index.html: index.md $(ARTICLES) $(TAGFILES) $(addprefix templates/,$(addsuffix .html,header index_header tag_list_header tag_entry tag_separator tag_list_footer article_list_header article_entry article_separator article_list_footer index_footer footer)) mkdir -p blog -- cgit v1.2.3 From 70c33511d1de43f1a85c0594f84cbf5e6b54c457 Mon Sep 17 00:00:00 2001 From: Luke Smith Date: Sat, 20 Mar 2021 12:38:55 -0400 Subject: "Recipe" in title for soych engine optimization --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 986aca3..0f7a9d7 100644 --- a/Makefile +++ b/Makefile @@ -137,7 +137,7 @@ blog/%.html: $(BLOG_SRC)/%.md $(addprefix templates/,$(addsuffix .html,header ar mkdir -p blog TITLE="$(shell head -n1 $< | sed 's/^# \+//')"; \ export TITLE; \ - PAGE_TITLE="$${TITLE} — $(BLOG_TITLE)"; \ + PAGE_TITLE="$${TITLE} Recipe — $(BLOG_TITLE)"; \ export PAGE_TITLE; \ AUTHOR="$(shell git log --format="%an" -- "$<" | tail -n 1)"; \ export AUTHOR; \ -- cgit v1.2.3 From b40f0f43afb37b669837b86c1557042cb3ee9dcc Mon Sep 17 00:00:00 2001 From: Luke Smith Date: Sun, 21 Mar 2021 08:37:45 -0400 Subject: fix #287 --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 0f7a9d7..96fa749 100644 --- a/Makefile +++ b/Makefile @@ -18,7 +18,7 @@ BLOG_SRC ?= articles .PHONY: help init build deploy clean taglist -ARTICLES = $(shell git ls-tree HEAD --name-only -- $(BLOG_SRC)/ 2>/dev/null) +ARTICLES = $(shell git ls-tree HEAD --name-only -- $(BLOG_SRC)/*.md 2>/dev/null) TAGFILES = $(patsubst $(BLOG_SRC)/%.md,tags/%,$(ARTICLES)) help: -- cgit v1.2.3 From 88bf288b6f22173390115ceda6f925a56e89a3a6 Mon Sep 17 00:00:00 2001 From: Steven Hall Date: Sun, 21 Mar 2021 14:17:34 -0700 Subject: Fixes duplicates on tag pages (#354) (#385) --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 96fa749..7233eca 100644 --- a/Makefile +++ b/Makefile @@ -117,7 +117,7 @@ blog/@%.html: $(TAGFILES) $(addprefix templates/,$(addsuffix .html,header tag_in envsubst < templates/tag_index_header.html >> $@; \ envsubst < templates/article_list_header.html >> $@; \ first=true; \ - for f in $(shell grep -FH '$*' $(TAGFILES) | sed 's,^tags/\([^:]*\):.*,$(BLOG_SRC)/\1.md,'); do \ + for f in $(shell awk '$$0 == "$*" { gsub("tags", "$(BLOG_SRC)", FILENAME); print FILENAME ".md"; nextfile; }' $(TAGFILES)); do \ printf '%s ' "$$f"; \ git log -n 1 --diff-filter=A --date="format:%s $(BLOG_DATE_FORMAT_INDEX)" --pretty=format:'%ad%n' -- "$$f"; \ done | sort | cut -d" " -f1,3- | while IFS=" " read -r FILE DATE; do \ -- cgit v1.2.3 From c3b8ff6455c77735c7339c617d8a869d1eba2c2e Mon Sep 17 00:00:00 2001 From: Steven Hall Date: Sun, 21 Mar 2021 18:15:01 -0700 Subject: Fix tag separator to allow hyphen separated tags like 'slow-cooked' (#386) --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 7233eca..edaeace 100644 --- a/Makefile +++ b/Makefile @@ -59,7 +59,7 @@ config: tags/%: $(BLOG_SRC)/%.md mkdir -p tags - grep -ih '^; *tags:' "$<" | cut -d: -f2- | tr '[:punct:]' ' ' | sed 's/ */\n/g' | sed '/^$$/d' | sort -u > $@ + grep -ih '^; *tags:' "$<" | cut -d: -f2- | tr -c '[^a-z\-]' ' ' | sed 's/ */\n/g' | sed '/^$$/d' | sort -u > $@ blog/index.html: index.md $(ARTICLES) $(TAGFILES) $(addprefix templates/,$(addsuffix .html,header index_header tag_list_header tag_entry tag_separator tag_list_footer article_list_header article_entry article_separator article_list_footer index_footer footer)) mkdir -p blog -- cgit v1.2.3