diff options
| -rwxr-xr-x | tools/validate-json.sh | 25 | ||||
| -rw-r--r-- | tox.ini | 4 |
2 files changed, 22 insertions, 7 deletions
diff --git a/tools/validate-json.sh b/tools/validate-json.sh index c4d1f3924..35338e8d9 100755 --- a/tools/validate-json.sh +++ b/tools/validate-json.sh @@ -1,17 +1,32 @@ #!/bin/bash set -e - -TMPFILE=$(mktemp) ret=0 +# For MacOSX users the freebsd's mktemp by default behave diferently, +# installing the coreutils from brew would give you this but that would be +# renamed to gmktemp to don't conflict with the stand mktemp, so let just use +# that if available. +if type -p gmktemp &>/dev/null; then + TMPFILE=$(gmktemp) +else + TMPFILE=$(mktemp) +fi + function clean { rm -f ${TMPFILE} } trap clean EXIT -for f in $(find docker/ -type f -name '*.json');do - jsonlint -s ${f} >${TMPFILE} - egrep -q 'has errors$' ${TMPFILE} && { cat ${TMPFILE}; ret=1 ;} +linter=jsonlint +type -p jsonlint &>/dev/null || linter=python + +for f in $(find docker -type f -name '*.json');do + if [[ ${linter} == jsonlint ]];then + jsonlint -s ${f} >${TMPFILE} + egrep -q 'has errors$' ${TMPFILE} && { cat ${TMPFILE}; ret=1 ;} + else + python -m json.tool ${f} &>/dev/null || { echo "$f: has json errors"; ret=1; } + fi done cat ${TMPFILE} @@ -1,11 +1,11 @@ [tox] skipsdist = True -envlist = validate-json +envlist = pep8 minversion = 1.6 [testenv] deps = -r{toxinidir}/test-requirements.txt -[testenv:validate-json] +[testenv:pep8] commands = {toxinidir}/tools/validate-json.sh |