mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-02 14:57:37 +02:00
Code Issues Releases Wiki Activity

[ticket/10760] Use externally specified PHP_BIN if any.

Browse Source 
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
This commit is contained in:
Oleg Pudeyev
2012-04-03 23:05:15 -04:00
parent 14e727b834
commit 57209a1e68
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
git-tools/hooks/pre-commit
View File

@@ -12,8 +12,10 @@
# ln -s ../../git-tools/hooks/pre-commit \\ # ln -s ../../git-tools/hooks/pre-commit \\
# .git/hooks/pre-commit # .git/hooks/pre-commit
# NOTE: this is run through /usr/bin/env if [ -z "$PHP_BIN" ]
PHP_BIN=php then
PHP_BIN=php
fi
# necessary check for initial commit # necessary check for initial commit
if git rev-parse --verify HEAD >/dev/null 2>&1 if git rev-parse --verify HEAD >/dev/null 2>&1
@@ -64,7 +66,7 @@ do
# check the staged file content for syntax errors # check the staged file content for syntax errors
# using php -l (lint) # 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 ] if [ $? -ne 0 ]
then then
error=1 error=1