mirror of
https://gitlab.com/fdroid/fdroidserver.git
synced 2024-10-03 17:50:11 +02:00
pre-commit: differentiate sh and bash files
This commit is contained in:
parent
547661fd3a
commit
e830b25561
@ -7,7 +7,8 @@
|
|||||||
exec 1>&2
|
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="hooks/pre-commit"
|
||||||
|
BASH_FILES="fd-commit jenkins-build docs/update.sh"
|
||||||
RB_FILES="buildserver/cookbooks/*/recipes/*.rb"
|
RB_FILES="buildserver/cookbooks/*/recipes/*.rb"
|
||||||
|
|
||||||
err() {
|
err() {
|
||||||
@ -19,8 +20,6 @@ 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
|
|
||||||
|
|
||||||
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
|
||||||
@ -37,8 +36,6 @@ else
|
|||||||
err "pep8 is not installed!"
|
err "pep8 is not installed!"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# If there are python errors or warnings, print them and fail.
|
|
||||||
|
|
||||||
if ! $PYFLAKES $PY_FILES; then
|
if ! $PYFLAKES $PY_FILES; then
|
||||||
err "pyflakes tests failed!"
|
err "pyflakes tests failed!"
|
||||||
fi
|
fi
|
||||||
@ -48,16 +45,18 @@ if ! $PEP8 --ignore=E123,E501 $PY_FILES; then
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
||||||
# check the syntax of included shell scripts with bash -n
|
|
||||||
|
|
||||||
for f in $SH_FILES; do
|
for f in $SH_FILES; do
|
||||||
|
if ! dash -n $f; then
|
||||||
|
err "dash tests failed!"
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
|
||||||
|
for f in $BASH_FILES; do
|
||||||
if ! bash -n $f; then
|
if ! bash -n $f; then
|
||||||
err "bash tests failed!"
|
err "bash tests failed!"
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
|
|
||||||
# check the syntax of included ruby scripts with ruby -c
|
|
||||||
|
|
||||||
for f in $RB_FILES; do
|
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!"
|
err "ruby tests failed!"
|
||||||
|
Loading…
Reference in New Issue
Block a user