Change RSS descriptions to use OpenGraph description

[web-old.git] / blogit

diff --git a/blogit b/blogit
index 5be242954ea9b3e0d0bab525081ae84cb4591b9f..7cabbaafc34e655683815d4c8bf35328541fb6cc 100755 (executable)
--- a/blogit
+++ b/blogit
@@ -139,6 +139,10 @@ 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; \
+       OG_IMAGE="$(shell grep -i '^; *og_image:' "$<" | cut -d: -f2-)"; \
+       export OG_IMAGE; \
        envsubst < templates/header.html > $@; \
        envsubst < templates/article_header.html >> $@; \
        sed -e 1d \
@@ -180,7 +184,7 @@ blog/rss.xml: $(ARTICLES)
                        "$(BLOG_URL_ROOT)/`basename $$FILE .md`.html" \
                        "$(BLOG_URL_ROOT)/`basename $$FILE .md`.html" \
                        "$$DATE" \
-                       "`sed -n 's/&/&amp;/;1d;/^$$/{2{d;b};q};p' < $$FILE`"; \
+                       "`cat "$$FILE" | grep ";description:" | cut -d: -f2-`"; \
        done >> $@
        printf '</channel>\n</rss>\n' >> $@
 
@@ -198,6 +202,6 @@ blog/atom.xml: $(ARTICLES)
                        "$$DATE" \
                        "`git log -n 1 --date="format:%Y-%m-%dT%H:%M:%SZ" --pretty=format:'%ad' -- "$$FILE"`" \
                        "$$AUTHOR" \
-                       "`sed -n 's/&/&amp;/;1d;/^$$/{2{d;b};q};p' < $$FILE`"; \
+                       "`cat "$$FILE" | grep ";description:" | cut -d: -f2-`"; \
        done >> $@
        printf '</feed>\n' >> $@