From c91fca7bb4e75cbdcde892a0198d0954f2c35f6e Mon Sep 17 00:00:00 2001 From: =?utf8?q?Daniel=20Mart=C3=AD?= Date: Sun, 9 Nov 2014 14:36:58 +0100 Subject: [PATCH] Properly catch return codes since -x is no longer used --- hooks/pre-commit | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/hooks/pre-commit b/hooks/pre-commit index 9abcc0a2..e4457023 100755 --- a/hooks/pre-commit +++ b/hooks/pre-commit @@ -37,20 +37,22 @@ else fi # If there are python errors or warnings, print them and fail. -$PYFLAKES $PY_FILES -$PEP8 --ignore=E123,E501 $PY_FILES + +if ! $PYFLAKES $PY_FILES; then + err "pyflakes tests failed!" +fi + +if ! $PEP8 --ignore=E123,E501 $PY_FILES; then + err "pep8 tests failed!" +fi -#------------------------------------------------------------------------------# -# check the syntax of included shell scripts +# check the syntax of included shell scripts with bash -n -# use bash to check that the syntax is correct for f in $SH_FILES; do - if bash -n $f; then - : # success! do nothing - else - err "FAILED!" - fi + if ! bash -n $f; then + err "bash tests failed!" + fi done exit 0 -- 2.30.2