ruby-changes:74310
From: Nobuyoshi <ko1@a...>
Date: Tue, 1 Nov 2022 18:05:15 +0900 (JST)
Subject: [ruby-changes:74310] 99a79dc40b (master): colorize.rb: support for NO_COLOR
https://git.ruby-lang.org/ruby.git/commit/?id=99a79dc40b From 99a79dc40bf20e0e5d588db4f93b69617affa7f3 Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada <nobu@r...> Date: Tue, 1 Nov 2022 10:56:28 +0900 Subject: colorize.rb: support for NO_COLOR --- tool/lib/colorize.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tool/lib/colorize.rb b/tool/lib/colorize.rb index 11b878d318..f11137cfdf 100644 --- a/tool/lib/colorize.rb +++ b/tool/lib/colorize.rb @@ -7,7 +7,7 @@ class Colorize https://github.com/ruby/ruby/blob/trunk/tool/lib/colorize.rb#L7 def initialize(color = nil, opts = ((_, color = color, nil)[0] if Hash === color)) @colors = @reset = nil @color = (opts[:color] if opts) - if color or (color == nil && STDOUT.tty?) + if color or (color == nil && STDOUT.tty? && (ENV["NO_COLOR"] || "").empty?) 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]*)/)] : {} -- cgit v1.2.3 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/