From: Hans-Christoph Steiner <hans@eds.org>
Date: Mon, 4 Dec 2017 11:10:46 +0000 (+0100)
Subject: hooks/pre-commit: make ruby and dash tests optional
X-Git-Tag: 1.0.0~43^2~7
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=67e6cbe7937793644c158a240e9cf304f639175c;p=fdroidserver.git

hooks/pre-commit: make ruby and dash tests optional

These are only used for checking syntax in buildserver/Vagrantfile.
Not requiring ruby makes doing CI tests on lots of distros easier
and faster. dash is an 'essential' package on Debian derivs, so
those tests will always be run somewhere.
---

diff --git a/hooks/pre-commit b/hooks/pre-commit
index 00d777f9..2bbfe39c 100755
--- a/hooks/pre-commit
+++ b/hooks/pre-commit
@@ -85,8 +85,10 @@ find_command() {
 	echo :
 }
 
+DASH=$(find_command dash)
 PYFLAKES=$(find_command pyflakes)
 PEP8=$(find_command pycodestyle pep8)
+RUBY=$(find_command ruby)
 
 if [ "$PY_FILES $PY_TEST_FILES" != " " ]; then
     if ! $PYFLAKES $PY_FILES $PY_TEST_FILES; then
@@ -110,7 +112,7 @@ if [ "$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
@@ -122,7 +124,7 @@ for f in $BASH_FILES; do
 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