X-Git-Url: https://git.danieliu.xyz/?a=blobdiff_plain;ds=sidebyside;f=pinopress;h=3623b2f65d0921eacf2586a169bb608c8434633b;hb=394bc43d24de087865fa4eed1920411c1a6d7ebd;hp=b457b131e7a33ac5be26daeca1a2fbbfdb969227;hpb=ae8408af2f6cac8cb64ff24aa1f2fe2c2255bf63;p=pinopress.git

diff --git a/pinopress b/pinopress
index b457b13..3623b2f 100755
--- a/pinopress
+++ b/pinopress
@@ -22,25 +22,15 @@ ARTICLE_LIST := $(basename $(shell ls $(SRC_DIR)))
 # some helper functions
 define export_common
 	export SITEURL="$(SITEURL)"
+	export ARTICLE_PATH="$(ARTICLE_PATH)"
 	export USERGLOBAL1="$(USERGLOBAL1)"
 	export USERGLOBAL2="$(USERGLOBAL2)"
 endef
 
-# usage: export_article [input md]
-define export_article
-	export ARTICLE_TITLE=`./$(MODULE_DIR)/md-header "$(1)" name`
-	export PUBLISHED_DATE=`./$(MODULE_DIR)/md-header "$(1)" published`
-	export DESCRIPTION=`./$(MODULE_DIR)/md-header "$(1)" description`
-	export USERLOCAL1=`./$(MODULE_DIR)/md-header "$(1)" userlocal1`
-	export USERLOCAL2=`./$(MODULE_DIR)/md-header "$(1)" userlocal2`
-	# vvv this is sorta ugly vvv
-	export ARTICLE_URL="$(SITEURL)/$(ARTICLE_PATH)/$(subst .md,.html,$(notdir "$(1)"))"
-endef
-
 # usage: loop_article [dest] [template_filename]
 define loop_article
 	for article_file in `ls $(SRC_DIR)`; do
-		$(call export_article,"$(SRC_DIR)/$$article_file")
+		. ./$(MODULE_DIR)/md-header "$(SRC_DIR)/$$article_file"
 		envsubst < $(TEMPLATE_DIR)/$(2) | sed -i "/<!-- $(shell echo $(addprefix mount_,$(basename $(basename $(2)))) | tr '[:lower:]' '[:upper:]') -->/r /dev/stdin" "$(1)"
 	done
 endef
@@ -79,6 +69,7 @@ $(BUILD_DIR)/$(ARTICLE_PATH)/%.html: $(SRC_DIR)/%.md
 	echo "parsing $<"
 	$(export_common)
 	$(call export_article,"$<")
+	. ./$(MODULE_DIR)/md-header "$<"
 	cat $(TEMPLATE_DIR)/head.template.html > "$@"
 	# module pipeline starts here
 	./$(MODULE_DIR)/md "$^" >> "$@"