From d23d20f31b502497bc2bd53b90b1103c7a1768c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=81lvaro=20Brey=20Vilas?= Date: Fri, 11 Mar 2022 11:42:11 +0100 Subject: [PATCH] Fix git hooks for new source location MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Álvaro Brey Vilas --- app/build.gradle | 2 +- scripts/hooks/pre-commit | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index f114dfec88..07722007b3 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -410,7 +410,7 @@ task installGitHooks(type: Copy, group: "development") { from("${project.rootDir}/scripts/hooks") { include '*' } - into '.git/hooks' + into "${project.rootDir}/.git/hooks" } detekt { diff --git a/scripts/hooks/pre-commit b/scripts/hooks/pre-commit index 3c45a4f245..514c082426 100755 --- a/scripts/hooks/pre-commit +++ b/scripts/hooks/pre-commit @@ -3,12 +3,12 @@ echo "Running pre-commit checks." if ! ./gradlew --daemon ktlint &>/dev/null; then - echo >&2 "Lint failed! See report at file://$(pwd)/build/ktlint.txt" + echo >&2 "Lint failed! See report at file://$(pwd)/app/build/ktlint.txt" echo >&2 "Hint: fix most lint errors with ./gradlew ktlintFormat" exit 1 fi if ! ./gradlew --daemon detekt &>/dev/null; then - echo >&2 "Detekt failed! See report at file://$(pwd)/build/reports/detekt/detekt.html" + echo >&2 "Detekt failed! See report at file://$(pwd)/app/build/reports/detekt/detekt.html" exit 1 fi