From: Daniel Martí <mvdan@mvdan.cc>
Date: Sun, 9 Nov 2014 13:34:24 +0000 (+0100)
Subject: Don't accept pyflakes/pep8 not being installed, common err func
X-Git-Tag: 0.3.0~24
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=d3faacf9b059063f62938f9c08f5f26d734995c7;p=fdroidserver.git

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

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