From: Erik Faye-Lund <kusmabite@gmail.com>
To: git@vger.kernel.org
Cc: msysgit@googlegroups.com
Subject: Re: [PATCH/RFC] test-lib: add support for colors without tput
Date: Fri, 14 Sep 2012 18:58:34 +0200 [thread overview]
Message-ID: <CABPQNSaArMz8hTiNZyD__K8bjntUuFUvk7Ojpu6NeXWLkJSUiA@mail.gmail.com> (raw)
In-Reply-To: <CABPQNSa1hEG_rB9hd8izW+iL1TQVAKu5W1=GbG20ROv-+DMgVg@mail.gmail.com>
On Fri, Sep 14, 2012 at 6:54 PM, Erik Faye-Lund <kusmabite@gmail.com> wrote:
> On Fri, Sep 14, 2012 at 6:41 PM, Erik Faye-Lund <kusmabite@gmail.com> wrote:
>> diff --git a/t/test-lib.sh b/t/test-lib.sh
>> index 78c4286..7d1b34b 100644
>> --- a/t/test-lib.sh
>> +++ b/t/test-lib.sh
>> @@ -129,6 +129,20 @@ export _x05 _x40 _z40 LF
>> # This test checks if command xyzzy does the right thing...
>> # '
>> # . ./test-lib.sh
>> +
>> +if ! which tput > /dev/null ; then
>> + tput () {
>> + case "$1" in
>> + bold)
>> + echo -ne "\033[1m" ;;
>> + setaf)
>> + echo -ne "\033[0;3$2m" ;;
>> + sgr0)
>> + echo -ne "\033(\033[m" ;;
>
> I should of course have checked this earlier, but I find now that
> "echo -ne" isn't portable. So perhaps this on top?
>
> diff --git a/t/test-lib.sh b/t/test-lib.sh
> index 7d1b34b..91a1d7b 100644
> --- a/t/test-lib.sh
> +++ b/t/test-lib.sh
> @@ -134,11 +134,11 @@ if ! which tput > /dev/null ; then
> tput () {
> case "$1" in
> bold)
> - echo -ne "\033[1m" ;;
> + printf "%b" "\033[1m" ;;
> setaf)
> - echo -ne "\033[0;3$2m" ;;
> + printf "%b" "\033[0;3$2m" ;;
> sgr0)
> - echo -ne "\033(\033[m" ;;
> + printf "%b" "\033(\033[m" ;;
> esac
> }
> fi
And again, I'm stupid for not reading documentation properly; octal
escaped strings in the format string should work (and does on my
systems), so this is sufficient:
diff --git a/t/test-lib.sh b/t/test-lib.sh
index 7d1b34b..2a6149e 100644
--- a/t/test-lib.sh
+++ b/t/test-lib.sh
@@ -134,11 +134,11 @@ if ! which tput > /dev/null ; then
tput () {
case "$1" in
bold)
- echo -ne "\033[1m" ;;
+ printf "\033[1m" ;;
setaf)
- echo -ne "\033[0;3$2m" ;;
+ printf "\033[0;3$2m" ;;
sgr0)
- echo -ne "\033(\033[m" ;;
+ printf "\033(\033[m" ;;
esac
}
fi
--
*** Please reply-to-all at all times ***
*** (do not pretend to know who is subscribed and who is not) ***
*** Please avoid top-posting. ***
The msysGit Wiki is here: https://github.com/msysgit/msysgit/wiki - Github accounts are free.
You received this message because you are subscribed to the Google
Groups "msysGit" group.
To post to this group, send email to msysgit@googlegroups.com
To unsubscribe from this group, send email to
msysgit+unsubscribe@googlegroups.com
For more options, and view previous threads, visit this group at
http://groups.google.com/group/msysgit?hl=en_US?hl=en
next prev parent reply other threads:[~2012-09-14 16:59 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-09-14 16:41 [PATCH/RFC] test-lib: add support for colors without tput Erik Faye-Lund
2012-09-14 16:54 ` Erik Faye-Lund
2012-09-14 16:58 ` Erik Faye-Lund [this message]
2012-09-14 17:08 ` Elia Pinto
2012-09-14 17:11 ` Erik Faye-Lund
2012-09-14 17:12 ` Elia Pinto
2012-09-14 17:16 ` Erik Faye-Lund
2012-09-14 17:28 ` Johannes Sixt
2012-09-14 17:31 ` Erik Faye-Lund
2012-09-14 18:11 ` Erik Faye-Lund
2012-09-14 19:15 ` Johannes Sixt
2012-09-17 17:39 ` Johannes Sixt
2012-09-14 17:30 ` Junio C Hamano
2012-09-14 17:42 ` Erik Faye-Lund
2012-09-14 18:03 ` Junio C Hamano
2012-09-14 17:44 ` Jeff King
2012-09-14 17:52 ` Erik Faye-Lund
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=CABPQNSaArMz8hTiNZyD__K8bjntUuFUvk7Ojpu6NeXWLkJSUiA@mail.gmail.com \
--to=kusmabite@gmail.com \
--cc=git@vger.kernel.org \
--cc=msysgit@googlegroups.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).