pre-commit: pep8 is now pycodestyle

[fdroidserver.git] / hooks / pre-commit

diff --git a/hooks/pre-commit b/hooks/pre-commit
index 0f083d00f3f397d6b50d47a86fc8829a479465f6..45a5b05234da3ecd3b4e5dea4f8b8cb0dcf0ebe5 100755 (executable)
--- a/hooks/pre-commit
+++ b/hooks/pre-commit
@@ -11,8 +11,8 @@ if [ -z "$files" ]; then
     PY_FILES="fdroid makebuildserver setup.py examples/*.py buildserver/*.py fdroidserver/*.py"
     PY_TEST_FILES="tests/*.TestCase"
     SH_FILES="hooks/pre-commit"
-    BASH_FILES="fd-commit jenkins-build docs/update.sh completion/bash-completion"
-    RB_FILES="buildserver/cookbooks/*/recipes/*.rb"
+    BASH_FILES="fd-commit jenkins-build docs/update.sh completion/bash-completion buildserver/provision-*"
+    RB_FILES="buildserver/cookbooks/*/recipes/*.rb buildserver/Vagrantfile"
 else
     # if actually committing right now, then only run on the files
     # that are going to be committed at this moment
@@ -23,6 +23,7 @@ else
     RB_FILES=
 
     for f in $files; do
+        test -e $f || continue
         case $f in
             *.py)
                 PY_FILES+=" $f"
@@ -58,12 +59,12 @@ fi
 PEP8_IGNORE="E123,E501,W503"
 
 err() {
-       echo ERROR: "$@"
+       echo >&2 ERROR: "$@"
        exit 1
 }
 
 warn() {
-       echo WARNING: "$@"
+       echo >&2 WARNING: "$@"
 }
 
 cmd_exists() {
@@ -71,20 +72,21 @@ cmd_exists() {
 }
 
 find_command() {
-       local name=$1
-       for suff in "3" "-python3" ""; do
-               cmd=${1}${suff}
-               if cmd_exists $cmd; then
-                       echo $cmd
-                       return 0
-               fi
+       for name in $@; do
+               for suff in "3" "-python3" ""; do
+                       cmd=${name}${suff}
+                       if cmd_exists $cmd; then
+                               echo $cmd
+                               return 0
+                       fi
+               done
        done
        warn "$1 is not installed, using dummy placeholder!"
-       echo -n echo
+       echo :
 }
 
 PYFLAKES=$(find_command pyflakes)
-PEP8=$(find_command pep8)
+PEP8=$(find_command pycodestyle pep8)
 
 if [ "$PY_FILES $PY_TEST_FILES" != " " ]; then
     if ! $PYFLAKES $PY_FILES $PY_TEST_FILES; then