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
RB_FILES=
for f in $files; do
+ test -e $f || continue
case $f in
*.py)
PY_FILES+=" $f"
PEP8_IGNORE="E123,E501,W503"
err() {
- echo ERROR: "$@"
+ echo >&2 ERROR: "$@"
exit 1
}
warn() {
- echo WARNING: "$@"
+ echo >&2 WARNING: "$@"
}
cmd_exists() {
}
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
+ 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