From 7f641232213d55945cf985aec163a62ab20a697e Mon Sep 17 00:00:00 2001 From: goncaloasimoes <32324608+goncaloasimoes@users.noreply.github.com> Date: Thu, 11 Aug 2022 17:21:03 +0100 Subject: [PATCH 1/2] Fix for composer ^2.2.2 --- php-pre-commit | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/php-pre-commit b/php-pre-commit index 604dd5c..a6cf5b9 100755 --- a/php-pre-commit +++ b/php-pre-commit @@ -15,13 +15,13 @@ then fi # Determine bin directory using composer ^2.2.2 global. -if [[ -z "$COMPOSER_BIN_DIR" ]]; then - BIN_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +if [[ -z "$COMPOSER_RUNTIME_BIN_DIR" ]]; then + HOOK_FILE_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )/pre-commit" else - BIN_DIR="$COMPOSER_BIN_DIR" + HOOK_FILE_PATH="$COMPOSER_RUNTIME_BIN_DIR/../26b/php-pre-commit/pre-commit" fi -HOOK_FILE_PATH="${BIN_DIR}/../26b/php-pre-commit/pre-commit" +echo $HOOK_FILE_PATH # Check if hook file exists before copying. if test -z "$HOOK_FILE_PATH" From 94f62dc6f4b3e311bc88f884d9facfc9973b7ebb Mon Sep 17 00:00:00 2001 From: goncaloasimoes <32324608+goncaloasimoes@users.noreply.github.com> Date: Thu, 11 Aug 2022 17:23:32 +0100 Subject: [PATCH 2/2] Remove echo --- php-pre-commit | 2 -- 1 file changed, 2 deletions(-) diff --git a/php-pre-commit b/php-pre-commit index a6cf5b9..4c4431c 100755 --- a/php-pre-commit +++ b/php-pre-commit @@ -21,8 +21,6 @@ else HOOK_FILE_PATH="$COMPOSER_RUNTIME_BIN_DIR/../26b/php-pre-commit/pre-commit" fi -echo $HOOK_FILE_PATH - # Check if hook file exists before copying. if test -z "$HOOK_FILE_PATH" then