From 39d3cfd6aeee730b14935fbbc6c1a1824bcbae22 Mon Sep 17 00:00:00 2001 From: Mike McQuaid Date: Mon, 11 Nov 2013 22:15:24 +0000 Subject: [PATCH] info: fix on non-tty terminals. References Homebrew/homebrew#18922. Closes Homebrew/homebrew#24188. Closes Homebrew/homebrew#24190. --- Library/Homebrew/cmd/info.rb | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/Library/Homebrew/cmd/info.rb b/Library/Homebrew/cmd/info.rb index 7818f788db..508efd6ffe 100644 --- a/Library/Homebrew/cmd/info.rb +++ b/Library/Homebrew/cmd/info.rb @@ -138,15 +138,23 @@ module Homebrew extend self def decorate_dependencies dependencies # necessary for 1.8.7 unicode handling since many installs are on 1.8.7 - tick = Tty.green + ["2714".hex].pack("U*") + Tty.reset - cross = Tty.red + ["2718".hex].pack("U*") + Tty.reset + tick = ["2714".hex].pack("U*") + cross = ["2718".hex].pack("U*") deps_status = dependencies.collect do |dep| - if ENV['HOMEBREW_NO_EMOJI'] - "%s%s%s" % [(dep.installed? ? Tty.green : Tty.red), dep, Tty.reset] + if dep.installed? + color = Tty.green + symbol = tick else - "%s %s" % [dep, (dep.installed? ? tick : cross)] + color = Tty.red + symbol = cross end + if ENV['HOMEBREW_NO_EMOJI'] + colored_dep = "#{color}#{dep}" + else + colored_dep = "#{dep} #{color}#{symbol}" + end + "#{colored_dep}#{Tty.reset}" end deps_status * ", " end