From 8ec704df113e556b599dc8952a668188ec1d0dd5 Mon Sep 17 00:00:00 2001 From: Matt Way Date: Thu, 15 Aug 2024 16:53:31 +1000 Subject: [PATCH] Fix config.json being included in media.json --- make-council-pages.sh | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/make-council-pages.sh b/make-council-pages.sh index 5488587..988a4aa 100644 --- a/make-council-pages.sh +++ b/make-council-pages.sh @@ -17,7 +17,14 @@ function create_or_update_page() { slug=$(echo "$council_block" | jq -r '.slug') - jq -n '[inputs | { (input_filename | sub("\\.json$"; "") | sub("^.+/"; "")): . }] | reduce .[] as $item ({}; . + $item)' "$DATA_PATH"/$slug/*.json > "$DATA_PATH"/$slug/media.json + media_inputs=() + for file in "$DATA_PATH"/$slug/*.{jpeg,jpg,png,gif}.json; do + if test -f "$file"; then + media_inputs+=("$file") + fi + done + + jq -n '[inputs | { (input_filename | sub("\\.json$"; "") | sub("^.+/"; "")): . }] | reduce .[] as $item ({}; . + $item)' "${media_inputs[@]}" > "$DATA_PATH"/$slug/media.json content=$(echo "$council_block" | jq -c | php php-template/main.php --council-file "php://stdin" --candidates-file "$DATA_PATH"/$slug/candidates.csv --media-file "$DATA_PATH"/$slug/media.json )