chiark / gitweb /
fix errors in pre-commit hook when run in test suite
authorHans-Christoph Steiner <hans@eds.org>
Thu, 11 Feb 2016 23:27:17 +0000 (00:27 +0100)
committerHans-Christoph Steiner <hans@eds.org>
Fri, 12 Feb 2016 07:33:22 +0000 (08:33 +0100)
hooks/pre-commit

index d33c701815c2e5475a9e5aec8376b62982ba7539..6dd0049d5ee3ae7ffc832b54fd90cc0a679aaf9e 100755 (executable)
@@ -83,13 +83,13 @@ else
        err "pep8 is not installed!"
 fi
 
-if [ ! -z $PY_FILES $PY_TEST_FILES ]; then
+if [ "$PY_FILES $PY_TEST_FILES" != " " ]; then
     if ! $PYFLAKES $PY_FILES $PY_TEST_FILES; then
        err "pyflakes tests failed!"
     fi
 fi
 
-if [ ! -z $PY_FILES ]; then
+if [ "$PY_FILES" != "" ]; then
     if ! $PEP8 --ignore=$PEP8_IGNORE $PY_FILES; then
        err "pep8 tests failed!"
     fi
@@ -98,7 +98,7 @@ fi
 # The tests use a little hack in order to cleanly import the fdroidserver
 # package locally like a regular package.  pep8 doesn't see that, so this
 # makes pep8 skip E402 on the test files that need that hack.
-if [ ! -z $PY_TEST_FILES ]; then
+if [ "$PY_TEST_FILES" != "" ]; then
     if ! $PEP8 --ignore=$PEP8_IGNORE,E402 $PY_TEST_FILES; then
        err "pep8 tests failed!"
     fi