From: Daniel Martí <mvdan@mvdan.cc>
Date: Wed, 13 Jul 2016 11:14:19 +0000 (+0100)
Subject: pre-commit: pep8 is now pycodestyle
X-Git-Tag: 0.7.0~32^2
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=fdroidserver.git;a=commitdiff_plain;h=b53e56916c23133788216589e47ddb1aac899a86

pre-commit: pep8 is now pycodestyle

See https://github.com/PyCQA/pycodestyle/issues/466.
---

diff --git a/hooks/pre-commit b/hooks/pre-commit
index 662e5787..45a5b052 100755
--- a/hooks/pre-commit
+++ b/hooks/pre-commit
@@ -72,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 :
 }
 
 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