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 buildserver/provision-*"
- RB_FILES="buildserver/cookbooks/*/recipes/*.rb buildserver/Vagrantfile"
+ BASH_FILES="jenkins-build-all jenkins-setup-build-environment jenkins-test completion/bash-completion buildserver/provision-*"
+ RB_FILES="buildserver/Vagrantfile"
else
# if actually committing right now, then only run on the files
# that are going to be committed at this moment
}
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" "-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 :
}
+DASH=$(find_command dash)
PYFLAKES=$(find_command pyflakes)
-PEP8=$(find_command pep8)
+PEP8=$(find_command pycodestyle pep8)
+RUBY=$(find_command ruby)
if [ "$PY_FILES $PY_TEST_FILES" != " " ]; then
if ! $PYFLAKES $PY_FILES $PY_TEST_FILES; then
fi
for f in $SH_FILES; do
- if ! dash -n $f; then
+ if ! $DASH -n $f; then
err "dash tests failed!"
fi
done
done
for f in $RB_FILES; do
- if ! ruby -c $f 1>/dev/null; then
+ if ! $RUBY -c $f 1>/dev/null; then
err "ruby tests failed!"
fi
done