From 0aff71b7cf87a046a4f731cdfec69a449177318c Mon Sep 17 00:00:00 2001 From: Kévin Le Gouguec Date: Mon, 15 Feb 2021 18:40:54 +0100 Subject: Make parameter script mandatory All pages were using it anyway. --- Makefile | 5 ++--- build.sh | 11 ++--------- 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/Makefile b/Makefile index af585b7..e8e790d 100644 --- 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 index ee479de..74e9ab8 100755 --- 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} -- cgit v1.2.3