mirrors/fdroidserver
1
0
Fork 0
mirror of https://github.com/f-droid/fdroidserver.git synced 2025-09-13 22:42:29 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Don't accept pyflakes/pep8 not being installed, common err func

Browse source
This commit is contained in:
Daniel Martí 2014-11-09 14:34:24 +01:00
parent cf4635e655
commit d3faacf9b0
1 changed files with 12 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

20
hooks/pre-commit
View file

@ -9,17 +9,23 @@ exec 1>&2
PY_FILES="fdroid makebuildserver setup.py examples/*.py buildserver/*.py fdroidserver/*.py" PY_FILES="fdroid makebuildserver setup.py examples/*.py buildserver/*.py fdroidserver/*.py"
SH_FILES="fd-commit jenkins-build docs/*.sh hooks/pre-commit" SH_FILES="fd-commit jenkins-build docs/*.sh hooks/pre-commit"
err() {
echo ERROR: "$@"
exit 1
}
cmd_exists() { cmd_exists() {
command -v $1 1>/dev/null command -v $1 1>/dev/null
} }
# For systems that switched to python3, first check for the python2 versions # For systems that switched to python3, first check for the python2 versions
if cmd_exists pyflakes-python2; then if cmd_exists pyflakes-python2; then
PYFLAKES=pyflakes-python2 PYFLAKES=pyflakes-python2
elif cmd_exists pyflakes; then elif cmd_exists pyflakes; then
PYFLAKES=pyflakes PYFLAKES=pyflakes
else else
echo "pyflakes is not installed!" err "pyflakes is not installed!"
fi fi
if cmd_exists pep8-python2; then if cmd_exists pep8-python2; then
@ -27,26 +33,24 @@ if cmd_exists pep8-python2; then
elif cmd_exists pep8; then elif cmd_exists pep8; then
PEP8=pep8 PEP8=pep8
else else
echo "pep8 is not installed!" err "pep8 is not installed!"
fi fi
# If there are python errors or warnings, print them and fail. # If there are python errors or warnings, print them and fail.
[ -n $PYFLAKES ] && $PYFLAKES $PY_FILES $PYFLAKES $PY_FILES
[ -n $PEP8 ] && $PEP8 --ignore=E123,E501 $PY_FILES $PEP8 --ignore=E123,E501 $PY_FILES
#------------------------------------------------------------------------------# #------------------------------------------------------------------------------#
# check the syntax of included shell scripts # check the syntax of included shell scripts
exitstatus=0
# use bash to check that the syntax is correct # use bash to check that the syntax is correct
for f in $SH_FILES; do for f in $SH_FILES; do
if bash -n $f; then if bash -n $f; then
: # success! do nothing : # success! do nothing
else else
echo "FAILED!" err "FAILED!"
exitstatus=1
fi fi
done done
exit $exitstatus exit 0