From 9ee4d600a7ed4ae6000f77a9617ac9e9d73800dd Mon Sep 17 00:00:00 2001 From: Jan Tuomi Date: Sat, 25 Nov 2017 22:18:41 +0200 Subject: [PATCH] Update setup.sh --- scripts/git/pre-commit | 3 +++ setup.sh | 1 + 2 files changed, 4 insertions(+) diff --git a/scripts/git/pre-commit b/scripts/git/pre-commit index 08b5fa1..989d554 100755 --- a/scripts/git/pre-commit +++ b/scripts/git/pre-commit @@ -2,8 +2,11 @@ set -e PURPLE='\033[0;35m' NC='\033[0m' # No Color +. "VIRTUALENV_ACTIVATE" + printf "${PURPLE}Running pre-commit tests.${NC}\n" npm test +pycodestyle . python manage.py test --noinput set +e diff --git a/setup.sh b/setup.sh index fe93c6a..3ef690d 100755 --- a/setup.sh +++ b/setup.sh @@ -58,6 +58,7 @@ echo "" if [[ $REPLY =~ ^[Yy]$ ]] then cp "$PWD/scripts/git/pre-commit" "$PWD/.git/hooks/pre-commit" + sed -i "s|VIRTUALENV_ACTIVATE|$(which activate)|g" "$PWD/.git/hooks/pre-commit" fi