mirrors/fdroidserver
1
0
Fork 0
mirror of https://github.com/f-droid/fdroidserver.git synced 2025-11-04 14:30:30 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'precommit-fixes' into 'master'

Browse source 
pre-commit script fixes



See merge request !145
This commit is contained in:
Daniel Martí 2016-07-13 15:32:34 +00:00
commit 0f708f367c
1 changed files with 12 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

23
hooks/pre-commit
View file

@ -59,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() {
@ -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
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