From 6cc8e9551820981558a9bbbcf25deb57903baf5b Mon Sep 17 00:00:00 2001 From: Jack Nagel Date: Fri, 10 Feb 2012 17:47:39 -0600 Subject: [PATCH] Be gentle when stdout is not a tty Signed-off-by: Jack Nagel --- Library/Homebrew/utils.rb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Library/Homebrew/utils.rb b/Library/Homebrew/utils.rb index e91700c5eb0c..b565d1988658 100644 --- a/Library/Homebrew/utils.rb +++ b/Library/Homebrew/utils.rb @@ -33,13 +33,13 @@ def escape n # args are additional inputs to puts until a nil arg is encountered def ohai title, *sput - title = title.to_s[0, Tty.width - 4] unless ARGV.verbose? + title = title.to_s[0, Tty.width - 4] if $stdout.tty? unless ARGV.verbose? puts "#{Tty.blue}==>#{Tty.white} #{title}#{Tty.reset}" puts sput unless sput.empty? end def oh1 title - title = title.to_s[0, Tty.width - 4] unless ARGV.verbose? + title = title.to_s[0, Tty.width - 4] if $stdout.tty? unless ARGV.verbose? puts "#{Tty.green}==> #{Tty.reset}#{title}" end @@ -112,6 +112,7 @@ def curl *args # See https://github.com/mxcl/homebrew/issues/6103 args << "--insecure" if MacOS.version < 10.6 args << "--verbose" if ENV['HOMEBREW_CURL_VERBOSE'] + args << "--silent" unless $stdout.tty? safe_system curl, *args end