From 14361d52892a6999f69c07ab08fed31293080a33 Mon Sep 17 00:00:00 2001 From: "Yann Esposito (Yogsototh)" Date: Tue, 27 Apr 2021 15:32:55 +0200 Subject: [PATCH] I think it's good now --- Makefile | 9 ++++++--- engine/optim-classes.sh | 4 ++-- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 7959375..63cb55d 100644 --- a/Makefile +++ b/Makefile @@ -47,7 +47,7 @@ $(DST_DIR)/%.html: $(SRC_DIR)/%.org $(TEMPLATE) HTML_INDEX := $(DST_DIR)/index.html MKINDEX := engine/mk-index.sh -$(HTML_INDEX): $(SRC_PANDOC_FILES) $(MKINDEX) +$(HTML_INDEX): $(DST_PANDOC_FILES) $(MKINDEX) mkdir -p $(DST_DIR) $(MKINDEX) @@ -72,7 +72,7 @@ $(DST_DIR)/%.gmi: $(SRC_DIR)/%.org $(GMI) OPTIM_DIR ?= _optim OPTIM := engine/pre-deploy.sh -$(OPTIM_DIR)/index.html: $(HTML_INDEX) $(SRC_RAW_FILES) $(OPTIM) +$(OPTIM_DIR)/index.html:$(DST_RAW_FILES) $(DST_GMI_FILES) $(DST_PANDOC_FILES) $(HTML_INDEX) $(OPTIM) mkdir -p $(OPTIM_DIR) $(OPTIM) @@ -87,5 +87,8 @@ deploy: $(OPTIM_DIR)/index.html allatend: $(ALL) +.PHONY: clean + clean: - rm -rf $(DST_DIR)/* + -rm -rf $(DST_DIR)/* + -rm -rf $(OPTIM_DIR)/* diff --git a/engine/optim-classes.sh b/engine/optim-classes.sh index ad16dda..d12c8bc 100755 --- a/engine/optim-classes.sh +++ b/engine/optim-classes.sh @@ -4,12 +4,12 @@ cd "$(git rev-parse --show-toplevel)" || exit 1 webdir="_optim" retrieve_classes_in_html () { - cat $webdir/**/*.html(N) | \ + cat $webdir/**/*.html | \ perl -pe 's/class="?([a-zA-Z0-9_-]*)/\nCLASS: $1\n/g' } retrieve_classes_in_css () { - cat $webdir/**/*.css(N) | \ + cat $webdir/**/*.css | \ perl -pe 's/ \.([a-zA-Z-_][a-zA-Z0-9-_]*)/\nCLASS:$1\n/g' }