expand json validation / processing

2 files changed, 11 insertions, 3 deletions

diff --git a/process_static b/process_static
index 9300ff3e..83e11869 100755
--- a/process_static
+++ b/process_static
@@ -1,12 +1,17 @@
 #!/bin/bash
 
 set -o errexit -o nounset -o pipefail
+shopt -s dotglob extglob globstar
 
 export PATH="$PWD/node_modules/.bin:$PATH"
 
 rm -rf static_tmp
 cp -a static static_tmp
-json_reformat -m < static_tmp/manifest.webmanifest | sponge static_tmp/manifest.webmanifest
+
+for file in static_tmp/**/*.@(json|webmanifest); do
+    json_reformat -m < "$file" | sponge "$file"
+done
+
 find static_tmp -name '*.xml' -exec xmllint --noblanks {} --output {} \;
 find static_tmp -name '*.css' -exec csso {} -o {} \;
 find static_tmp -name '*.html' -exec html-minifier --collapse-whitespace --process-scripts "application/ld+json" --collapse-boolean-attributes --remove-attribute-quotes --remove-comments --remove-empty-attributes --remove-redundant-attributes --remove-script-type-attributes --remove-style-link-type-attributes --sort-attributes --sort-class-name {} -o {} \;
diff --git a/validate_static b/validate_static
index 591a9d49..d488fd97 100755
--- a/validate_static
+++ b/validate_static
@@ -1,11 +1,14 @@
 #!/bin/bash
 
 set -o errexit -o nounset -o pipefail
-shopt -s extglob globstar
+shopt -s dotglob extglob globstar
 
 export PATH="$PWD/node_modules/.bin:$PATH"
 
-json_verify < static/manifest.webmanifest >/dev/null
+for file in static/**/*.@(json|webmanifest); do
+    json_verify < "$file" >/dev/null
+done
+
 xmllint --noout static/**/*.@(html|svg|xml)
 eslint static/**/*.js
 stylelint static/**/*.css