quatuorbellefeuille.com

commit 0aff71b7cf87a046a4f731cdfec69a449177318c
parent 2eeda668db31cea1d47ca45907b839d6b0f5f2b9
Author: Kévin Le Gouguec <kevin.legouguec@gmail.com>
Date:   Mon, 15 Feb 2021 18:40:54 +0100

Make parameter script mandatory

All pages were using it anyway.

Diffstat:
M
Makefile
 | 
5
++---
M
build.sh
 | 
11
++---------

2 files changed, 4 insertions(+), 12 deletions(-)
diff --git a/Makefile b/Makefile
@@ -34,9 +34,8 @@ $(images): $(OUTDIR)/%: % | $(images_folders)
 $(stylesheets): $(OUTDIR)/%: % | $(stylesheets_folders)
 	cp $< $@
 
-# TODO: optional dependency to .sh template parameters.
-$(pages): $(OUTDIR)/%.html: %.html template.html | $(OUTDIR)
-	./build.sh $< $@
+$(pages): $(OUTDIR)/%.html: %.html %.sh template.html | $(OUTDIR)
+	./build.sh $< $*.sh $@
 
 $(OUTDIR)/quatuor.html: quatuor.md
 
diff --git a/build.sh b/build.sh
@@ -3,15 +3,8 @@
 set -eu
 
 input=$1
-output=$2
-
-parameters=${input/%.html/.sh}
-
-if ! test -f ${parameters}
-then
-    cp ${input} ${output}
-    exit
-fi
+parameters=$2
+output=$3
 
 cp template.html ${output}