From fc530e56cf17494be840933fd56534be42fbac45 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Sat, 11 Apr 2015 13:04:37 -0700 Subject: [PATCH] Port commit-msg to MSYS Bash+Gawk See Eli Zaretskii in: http://lists.gnu.org/archive/html/emacs-devel/2015-04/msg00610.html * build-aux/git-hooks/commit-msg (cent_sign_utf8_format) (cent_sign, print_at_sign, at_sign): Revert previous change. (print_at_sign): Prepend "BEGIN". (at_sign): Redirect from /dev/null to be safer with pre-POSIX awk. --- build-aux/git-hooks/commit-msg | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/build-aux/git-hooks/commit-msg b/build-aux/git-hooks/commit-msg index 3fc6e19e1dd..6e31dbcbdbe 100755 --- a/build-aux/git-hooks/commit-msg +++ b/build-aux/git-hooks/commit-msg @@ -29,11 +29,12 @@ fi # Use a UTF-8 locale if available, so that the UTF-8 check works. # Use U+00A2 CENT SIGN to test whether the locale works. -cent_sign='¢' -print_at_sign='{print substr("'$cent_sign'@", 2)}' -at_sign=`$awk "$print_at_sign" 2>/dev/null` +cent_sign_utf8_format='\302\242\n' +cent_sign=`printf "$cent_sign_utf8_format"` +print_at_sign='BEGIN {print substr("'$cent_sign'@", 2)}' +at_sign=`$awk "$print_at_sign" /dev/null` if test "$at_sign" != @; then - at_sign=`LC_ALL=en_US.UTF-8 $awk "$print_at_sign" 2>/dev/null` + at_sign=`LC_ALL=en_US.UTF-8 $awk "$print_at_sign" /dev/null` if test "$at_sign" = @; then LC_ALL=en_US.UTF-8; export LC_ALL fi -- 2.39.2