haskal
/
vagrant
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Simplify cygwin check everywhere

This commit is contained in:
Mitchell Hashimoto 2013-04-06 16:05:13 -07:00
parent fb9c311b4d
commit 5ca89383f8
2 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
bin/vagrant
View File

@ -36,14 +36,8 @@ if ARGV.include?("--no-color")
opts[:ui_class] = Vagrant::UI::Basic opts[:ui_class] = Vagrant::UI::Basic
elsif !Vagrant::Util::Platform.terminal_supports_colors? elsif !Vagrant::Util::Platform.terminal_supports_colors?
opts[:ui_class] = Vagrant::UI::Basic opts[:ui_class] = Vagrant::UI::Basic
elsif !$stdout.tty? elsif !$stdout.tty? && !Vagrant::Util::Platform.cygwin?
# If we're not a TTY, verify we're not in Cygwin. Cygwin always
# reports that stdout is not a TTY, when in fact it is.
ENV["VAGRANT_DETECTED_OS"] ||= ""
if !ENV["VAGRANT_DETECTED_OS"].downcase.include?("cygwin")
opts[:ui_class] = Vagrant::UI::Basic opts[:ui_class] = Vagrant::UI::Basic
end
end end
# Default to colored output # Default to colored output

6
lib/vagrant/util/platform.rb
View File

@ -17,6 +17,9 @@ module Vagrant
end end
def cygwin? def cygwin?
return true if ENV["VAGRANT_DETECTED_OS"] &&
ENV["VAGRANT_DETECTED_OS"].downcase.include?("cygwin")
platform.include?("cygwin") platform.include?("cygwin")
end end
@ -67,8 +70,7 @@ module Vagrant
# output. # output.
def terminal_supports_colors? def terminal_supports_colors?
if windows? if windows?
return ENV.has_key?("ANSICON") || return ENV.has_key?("ANSICON") || cygwin?
ENV["VAGRANT_DETECTED_OS"].downcase.include?("cygwin")
end end
true true