remove fd-commit, no active devs use it, and requires Auto Name/Name

[fdroidserver.git] / hooks / pre-commit

diff --git a/hooks/pre-commit b/hooks/pre-commit
index 724a832d46a91c2c54d688fc436443d7d684028f..1dcc1d5aeee269568467658c3234a32b876e3e2f 100755 (executable)
--- a/hooks/pre-commit
+++ b/hooks/pre-commit
@@ -11,8 +11,8 @@ if [ -z "$files" ]; then
     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"
-    RB_FILES="buildserver/cookbooks/*/recipes/*.rb"
+    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
@@ -59,12 +59,12 @@ fi
 PEP8_IGNORE="E123,E501,W503"
 
 err() {
-       echo ERROR: "$@"
+       echo >&2 ERROR: "$@"
        exit 1
 }
 
 warn() {
-       echo WARNING: "$@"
+       echo >&2 WARNING: "$@"
 }
 
 cmd_exists() {
@@ -72,20 +72,23 @@ cmd_exists() {
 }
 
 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
+       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
@@ -109,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
@@ -121,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