зеркало из https://github.com/github/ruby.git
Try "so" attribute if "smso" is not found
This commit is contained in:
Родитель
9accb92ba1
Коммит
afd4cfcf22
|
@ -8,7 +8,7 @@ class Colorize
|
|||
@colors = @reset = nil
|
||||
@color = (opts[:color] if opts)
|
||||
if color or (color == nil && STDOUT.tty?)
|
||||
if (/\A\e\[.*m\z/ =~ IO.popen("tput smso", "r", :err => IO::NULL, &:read) rescue nil)
|
||||
if (%w[smso so].any? {|attr| /\A\e\[.*m\z/ =~ IO.popen("tput #{attr}", "r", :err => IO::NULL, &:read)} rescue nil)
|
||||
@beg = "\e["
|
||||
colors = (colors = ENV['TEST_COLORS']) ? Hash[colors.scan(/(\w+)=([^:\n]*)/)] : {}
|
||||
if opts and colors_file = opts[:colors_file]
|
||||
|
|
|
@ -9,6 +9,7 @@ AC_DEFUN([_COLORIZE_RESULT_PREPARE], [
|
|||
[configure_tty=0])])
|
||||
AS_IF([test $configure_tty -eq 1], [
|
||||
msg_begin="`tput smso 2>/dev/null`"
|
||||
AS_IF([test -z "$msg_begin"], [msg_begin="`tput so 2>/dev/null`"])
|
||||
AS_CASE(["$msg_begin"], ['@<:@'*m],
|
||||
[msg_begin="`echo "$msg_begin" | sed ['s/[0-9]*m$//']`"
|
||||
msg_checking="${msg_begin}33m"
|
||||
|
|
Загрузка…
Ссылка в новой задаче