diff --git a/extensions/fablabchemnitz/000_validate.sh b/extensions/fablabchemnitz/000_validate.sh index cb8e0d6e..df6741bc 100755 --- a/extensions/fablabchemnitz/000_validate.sh +++ b/extensions/fablabchemnitz/000_validate.sh @@ -12,14 +12,18 @@ grep -v "validates\|warning: failed to load external entity" 000_xmllint.out; rm #complete set of meta information AGGLOMERATED_JSON="" for folder in */ ; do - if [[ ! -f "${folder}/meta.json" ]]; then + if [[ ! -f "${folder}meta.json" ]]; then echo "meta.json missing for ${folder}" else - echo ${AGGLOMERATED_JSON} > /tmp/prevJson - AGGLOMERATED_JSON=$(jq -s ".[0] + .[1]" /tmp/prevJson ${folder}/meta.json) - + JSON_OKAY=$(jq -e . ${folder}meta.json) + if [ $? -eq 0 ]; then + echo ${AGGLOMERATED_JSON} > /tmp/prevJson + AGGLOMERATED_JSON=$(jq -s ".[0] + .[1]" /tmp/prevJson ${folder}meta.json) + else + echo Format error in ${folder}meta.json + fi #DEBUG - #cat ${folder}/meta.json | jq + #cat ${folder}meta.json | jq fi done #print overall json @@ -59,7 +63,7 @@ sed -i 's/\*\* with .* \.inx files\*\*/\*\* with \*\*'${INX}' \.inx files\*\*/g' echo "Removing unrequired pyc cache files" -find . -type d -name "__pycache__" -exec rm -rf {} \; +find . -type d -name "__pycache__" -exec rm -rf {} \; > /dev/null read -p "Build local gallery extension zip files?" -n 1 -r diff --git a/extensions/fablabchemnitz/styles_to_layers/meta.json b/extensions/fablabchemnitz/styles_to_layers/meta.json index 47fb744d..8d35fe8f 100644 --- a/extensions/fablabchemnitz/styles_to_layers/meta.json +++ b/extensions/fablabchemnitz/styles_to_layers/meta.json @@ -6,7 +6,7 @@ "dependent_extensions": [ "apply_transformations", "remove_empty_groups" - ],, + ], "original_name": "Styles To Layers", "original_id": "fablabchemnitz.de.styles_to_layers", "license": "GNU GPL v3",