From b0c35ff2db3a4ebb12a405705592e938f50bff64 Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Tue, 4 Jun 2019 17:23:57 +0900 Subject: [PATCH] colorize.rb: fix reading from test/colors [ci skip] --- tool/colorize.rb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tool/colorize.rb b/tool/colorize.rb index 73dd9e52fd..ed79858ba4 100644 --- a/tool/colorize.rb +++ b/tool/colorize.rb @@ -6,13 +6,14 @@ class Colorize if color or (color == nil && STDOUT.tty?) if (/\A\e\[.*m\z/ =~ IO.popen("tput smso", "r", err: IO::NULL, &:read) rescue nil) @beg = "\e[" - @colors = (colors = ENV['TEST_COLORS']) ? Hash[colors.scan(/(\w+)=([^:\n]*)/)] : {} + colors = (colors = ENV['TEST_COLORS']) ? Hash[colors.scan(/(\w+)=([^:\n]*)/)] : {} begin File.read(File.join(__dir__, "../test/colors")).scan(/(\w+)=([^:\n]*)/) do |n, c| colors[n] ||= c end - rescue + rescue Errno::ENOENT end + @colors = colors @reset = "#{@beg}m" end end