Updated git pre-commit hook to use code:check command.

systemseed · Aug 22, 2018 · 86aaf16 · 86aaf16
1 parent 13f4857
commit 86aaf16
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 9 deletions.
diff --git a/.git-hooks/pre-commit b/.git-hooks/pre-commit
@@ -20,15 +20,11 @@ then
   exit 0
 fi
 
-# Run PHP checks (all codebase).
-make --quiet phpcs
-PHPCS_RESULT=$?
+# Run code standards checks.
+make --quiet code:check
+CHECKS_RESULT=$?
 
-# Run JS checks (all codebase).
-make --quiet eslint
-ESLINT_RESULT=$?
-
-if [ $PHPCS_RESULT -ne 0 ] || [ $ESLINT_RESULT -ne 0 ]
+if [ $CHECKS_RESULT -ne 0 ]
 then
 
   echo "${white}${bg_red}"

diff --git a/Makefile b/Makefile
@@ -85,7 +85,7 @@ prepare: | up
 	$(call docker-wodby, php chmod 666 web/sites/default/settings.php)
 	# Prepare git hooks.
 	$(call message,$(PROJECT_NAME): Setting up git hooks)
-	ln -s $(shell pwd)/.git-hooks/* $(shell pwd)/.git/hooks/
+	ln -s $(shell pwd)/.git-hooks/* $(shell pwd)/.git/hooks
 
 
 install: | prepare