diff options
| author | Oleg Pudeyev <oleg@bsdpower.com> | 2012-04-03 23:05:15 -0400 |
|---|---|---|
| committer | Oleg Pudeyev <oleg@bsdpower.com> | 2012-04-03 23:05:15 -0400 |
| commit | 57209a1e680da729cad0a1cd7e9462254edcd6cb (patch) | |
| tree | 5451969558352d4606cfeafa0f15b55260c40a35 /git-tools | |
| parent | 14e727b8345e7933662a2b363736866966996839 (diff) | |
| download | forums-57209a1e680da729cad0a1cd7e9462254edcd6cb.tar forums-57209a1e680da729cad0a1cd7e9462254edcd6cb.tar.gz forums-57209a1e680da729cad0a1cd7e9462254edcd6cb.tar.bz2 forums-57209a1e680da729cad0a1cd7e9462254edcd6cb.tar.xz forums-57209a1e680da729cad0a1cd7e9462254edcd6cb.zip | |
[ticket/10760] Use externally specified PHP_BIN if any.
We have a PHP_BIN variable but we always set it unconditionally,
therefore in order to use a different php binary one had to
modify the hook script.
Instead set PHP_BIN if it is not set.
Now one can set PHP_BIN in their environment to use a non-default
php binary.
PHPBB3-10760
Diffstat (limited to 'git-tools')
| -rwxr-xr-x | git-tools/hooks/pre-commit | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/git-tools/hooks/pre-commit b/git-tools/hooks/pre-commit index 4d03359773..a8bb12e96e 100755 --- a/git-tools/hooks/pre-commit +++ b/git-tools/hooks/pre-commit @@ -12,8 +12,10 @@ # ln -s ../../git-tools/hooks/pre-commit \\ # .git/hooks/pre-commit -# NOTE: this is run through /usr/bin/env -PHP_BIN=php +if [ -z "$PHP_BIN" ] +then + PHP_BIN=php +fi # necessary check for initial commit if git rev-parse --verify HEAD >/dev/null 2>&1 @@ -64,7 +66,7 @@ do # check the staged file content for syntax errors # using php -l (lint) - result=$(git cat-file -p $sha | /usr/bin/env $PHP_BIN -l 2>/dev/null) + result=$(git cat-file -p $sha | $PHP_BIN -l 2>/dev/null) if [ $? -ne 0 ] then error=1 |