Re: Re*: [PATCH/RFC] Change t0204-gettext-reencode-sanity.sh to pass under Mac OSX

[Junio C Hamano <gitster@pobox.com>]

Torsten Bögershausen <tboegi@web.de> writes:

> [snip]
>  (. gettext.sh; eval_gettext frotz; echo $?)
> frotz0

So your system can claim "gnu".  The patch I sent earlier that
replaced "type gettext.sh" with something like the above should work
along that line.

> I get
> : no probing necessary

> When I run the following scriptlet, 
> ...
> elif test -n "@@USE_FALLTHROUGH_GETTEXT_SCHEME@@$GIT_INTERNAL_GETTEXT_TEST_FALLBACKS"
> then
> 		echo ": no probing necessary"

Gaah.  That should read as @@USE_GETTEXT_SCHEME@@, which would be
replaced by the Makefile to become either empty (if you run "make"
without forcing USE_GETTEXT_SCHEME to any particular value).

It comes from ad17ea7 (add a Makefile switch to avoid gettext
translation in shell scripts, 2012-01-23) but nobody replaces the
token anywhere.

http://thread.gmane.org/gmane.comp.version-control.git/188706/focus=189016
and comparing it with the original (focus=188827 in the same thread),
we can see that this was my mistake while re-rolling the patch.

-- >8 --
Subject: i18n: fix auto detection of gettext scheme for shell scripts

A new code added by ad17ea7 (add a Makefile switch to avoid gettext
translation in shell scripts, 2012-01-23) tried to optionally force
a gettext scheme to "fallthrough", but ended up forcing it to everybody.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
 git-sh-i18n.sh |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/git-sh-i18n.sh b/git-sh-i18n.sh
index d5fae99..6a27f68 100644
--- a/git-sh-i18n.sh
+++ b/git-sh-i18n.sh
@@ -21,7 +21,7 @@ GIT_INTERNAL_GETTEXT_SH_SCHEME=fallthrough
 if test -n "@@USE_GETTEXT_SCHEME@@"
 then
 	GIT_INTERNAL_GETTEXT_SH_SCHEME="@@USE_GETTEXT_SCHEME@@"
-elif test -n "@@USE_FALLTHROUGH_GETTEXT_SCHEME@@$GIT_INTERNAL_GETTEXT_TEST_FALLBACKS"
+elif test -n "$GIT_INTERNAL_GETTEXT_TEST_FALLBACKS"
 then
 	: no probing necessary
 elif test -n "$GIT_GETTEXT_POISON"