From 786fcbf212caf4c201d9abba36fca3b8f58617a9 Mon Sep 17 00:00:00 2001 From: Oleg Pudeyev Date: Tue, 3 Apr 2012 23:06:50 -0400 Subject: [PATCH] [ticket/10760] Use echo -e only if echo understands -e. /bin/echo on freebsd and dash's builtin echo do not understand -e, therefore -e is printed with the other messages in such cases. Test if echo understands -e, if not do not use it. PHPBB3-10760 --- git-tools/hooks/pre-commit | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/git-tools/hooks/pre-commit b/git-tools/hooks/pre-commit index a8bb12e96e..0e230d3308 100755 --- a/git-tools/hooks/pre-commit +++ b/git-tools/hooks/pre-commit @@ -17,6 +17,13 @@ then PHP_BIN=php fi +if [ $(echo -e test) = test ] +then + echo_e="echo -e" +else + echo_e="echo" +fi + # necessary check for initial commit if git rev-parse --verify HEAD >/dev/null 2>&1 then @@ -78,7 +85,7 @@ unset IFS if [ $error -eq 1 ] then - echo -e "PHP Syntax check failed:"; - echo -e "$errors" | grep "^Parse error:" + echo "PHP Syntax check failed:" + $echo_e "$errors" | grep "^Parse error:" exit 1 fi