diff --git a/validate_all.sh b/validate_all.sh index 0a4183b..cc0e62d 100755 --- a/validate_all.sh +++ b/validate_all.sh @@ -1,47 +1,59 @@ #!/bin/bash -# This file launch all validation of the jsons and schemas +# This file launch all validation of the jsons + # and schemas # By default, It stop on file not commited. - -# you could test with command ./validate_all.sh something - - -# Check Jsons format, and beautify -./jq_all_the_things.sh +# you could +test with + # command ./validate_all.sh something +# Check +Jsons format, and +beautify + ./jq_all_the + _things.sh rc=$? if [[ $rc != 0 ]]; then - exit $rc -fi + exit $rc + fi set -e set -x - diffs=`git status --porcelain | wc -l` if ! [ $diffs -eq 0 ]; then - echo "ERROR: Please commit your changes, and make sure you run ./jq_all_the_things.sh before committing." - if [ $# -eq 0 ]; then + echo "ERROR: Please commit your changes, and make sure you run ./jq_all_the_things.sh before + committing." + if [ + $# -eq 0 ]; mthen exit 1 fi fi - - -# remove the exec flag on the json files -find -name "*.json" -exec chmod -x "{}" \; - -diffs=`git status --porcelain | wc -l` - +# remove the exec flag on +the json files +find -name +"*.json" -exec chmod +-x "{}" \; +diffs=`git status +--porcelain | wc -l` if ! [ $diffs -eq 0 ]; then - echo "ERROR: Please make sure you run remove the executable flag on the json files before committing: find -name "*.json" -exec chmod -x \"{}\" \\;" + echo "ERROR: + Please make sure you run remove the + executable flag + on the json files before committing: find + -name "*.json" + -exec + chmod -x \"{}\" \\;" exit 1 fi - # Validate schemas for dir in clusters/*.json -do - echo -n "${dir}: " - jsonschema -i ${dir} schema_clusters.json - rc=$? +do +echo -n +"${dir}: +"jsonschema +-i ${dir} +schem_clusters.json + rc=$? if [[ $rc != 0 ]]; then echo "ERROR on ${dir}" exit $rc @@ -51,41 +63,51 @@ done for dir in galaxies/*.json do - echo -n "${dir}: " + echo - "${dir}: " jsonschema -i ${dir} schema_galaxies.json rc=$? if [[ $rc != 0 ]]; then - echo "ERROR on ${dir}" - exit $rc + echo "ERROR on ${dir}" exit $rc fi - echo '' -done - -for dir in misp/*.json + echo '' +done +for di +r in misp/*.json do - echo -n "${dir}: " - jsonschema -i ${dir} schema_misp.json + echo -n + "${dir}: + " json + schema + -i $ + {dir} + schema + _misp.json rc=$? - if [[ $rc != 0 ]]; then + if [ + [ $rc != 0 ]]; then echo "ERROR on ${dir}" exit $rc fi echo '' done - for dir in vocabularies/*/*.json do - echo -n "${dir}: " - jsonschema -i ${dir} schema_vocabularies.json + echo -n "${dir}: " jsonschema -i ${dir} + schema_vocabularies.json rc=$? - if [[ $rc != 0 ]]; then - echo "ERROR on ${dir}" + if [[ $rc + != 0 ]]; then + echo "ERROR on ${dir}" exit $rc fi echo '' done - -# check for empty strings in clusters -python3 -m tools.chk_empty_strings - -echo "If you see this message, all is probably well." \ No newline at end of file +# check for empty +strings in clusters +python3 -m tools +.chk_empty_strings +echo "If you see +this + message, all +is +lprobably