Fix detection of pyflakes3 found in Debian

[fdroidserver.git] / hooks / pre-commit

diff --git a/hooks/pre-commit b/hooks/pre-commit
index 53479051406eae24915a0faee6c6d5af4aceb261..f0e4d657d4b92f40294154a6b27d2d6b48e800eb 100755 (executable)
--- a/hooks/pre-commit
+++ b/hooks/pre-commit
@@ -70,22 +70,21 @@ cmd_exists() {
        command -v $1 1>/dev/null
 }
 
-if cmd_exists pyflakes-python3; then
-       PYFLAKES=pyflakes-python3
-elif cmd_exists pyflakes; then
-       PYFLAKES=pyflakes
-else
-       PYFLAKES=echo
-       warn "pyflakes is not installed, using dummy placeholder!"
-fi
+find_command() {
+       local name=$1
+       for suff in "3" "-python3" ""; do
+               cmd=${1}${suff}
+               if cmd_exists $cmd; then
+                       echo -n $cmd
+                       return 0
+               fi
+       done
+       warn "$1 is not installed, using dummy placeholder!"
+       echo -n echo
+}
 
-if cmd_exists pep8-python3; then
-       PEP8=pep8-python3
-elif cmd_exists pep8; then
-       PEP8=pep8
-else
-       err "pep8 is not installed!"
-fi
+PYFLAKES=$(find_command pyflakes)
+PEP8=$(find_command pep8)
 
 if [ "$PY_FILES $PY_TEST_FILES" != " " ]; then
     if ! $PYFLAKES $PY_FILES $PY_TEST_FILES; then