X-Git-Url: https://git.based.quest/?p=web-old.git;a=blobdiff_plain;f=blogit;h=4f590f4ad53d34b7bb22ad1920f07bae41d726e9;hp=6035d1ec35526d786dce695752967f397e7121a2;hb=8c9e33cda9a6753f01cf770e15e65077d6fe614c;hpb=0324a0cf72ccfa59db420a6574d6c59a579e4d9f
diff --git a/blogit b/blogit
index 6035d1e..4f590f4 100755
--- a/blogit
+++ b/blogit
@@ -139,6 +139,8 @@ blog/%.html: $(BLOG_SRC)/%.md $(addprefix templates/,$(addsuffix .html,header ar
export DATE_EDITED; \
TAGS="$(shell grep -i '^; *tags:' "$<" | cut -d: -f2- | paste -sd ',')"; \
export TAGS; \
+ DESCRIPTION="$(shell grep -i '^; *description:' "$<" | cut -d: -f2-)"; \
+ export DESCRIPTION; \
envsubst < templates/header.html > $@; \
envsubst < templates/article_header.html >> $@; \
sed -e 1d \
@@ -176,11 +178,11 @@ blog/rss.xml: $(ARTICLES)
git log --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 .md`.html" \
"$(BLOG_URL_ROOT)/`basename $$FILE .md`.html" \
"$$DATE" \
- "`sed -n '1d;/^$$/{2{d;b};q};p' < $$FILE`"; \
+ "`sed -n 's/&/&/;1d;/^$$/{2{d;b};q};p' < $$FILE`"; \
done >> $@
printf '\n\n' >> $@
@@ -192,12 +194,12 @@ blog/atom.xml: $(ARTICLES)
git log --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 .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" \
- "`sed -n '1d;/^$$/{2{d;b};q};p' < $$FILE`"; \
+ "`sed -n 's/&/&/;1d;/^$$/{2{d;b};q};p' < $$FILE`"; \
done >> $@
printf '\n' >> $@