summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLamont Granquist <lamont@scriptkiddie.org>2013-11-13 15:00:21 -0800
committerBryan McLellan <btm@opscode.com>2013-11-26 07:31:19 -0800
commitb391cf572288afca7cf26f6c38d2b9860ec4b3fd (patch)
treeb4fbed8e44773431da3ae6f1e5d0ec0d9badf65e
parent1f5218a4713551e53613fcdf57158185413c5967 (diff)
downloadchef-b391cf572288afca7cf26f6c38d2b9860ec4b3fd.tar.gz
CHEF-4759: chef-solo --no-color default on windows
- also add --color option to chef-apply and same default for win
-rw-r--r--lib/chef/application/apply.rb6
-rw-r--r--lib/chef/application/solo.rb2
2 files changed, 7 insertions, 1 deletions
diff --git a/lib/chef/application/apply.rb b/lib/chef/application/apply.rb
index 9bffa4824e..dfec31c51e 100644
--- a/lib/chef/application/apply.rb
+++ b/lib/chef/application/apply.rb
@@ -74,6 +74,12 @@ class Chef::Application::Apply < Chef::Application
:description => 'Enable whyrun mode',
:boolean => true
+ option :color,
+ :long => '--[no-]color',
+ :boolean => true,
+ :default => !Chef::Platform.windows?,
+ :description => "Use colored output, defaults to enabled"
+
def initialize
super
end
diff --git a/lib/chef/application/solo.rb b/lib/chef/application/solo.rb
index 47825a9701..dc8a3588ad 100644
--- a/lib/chef/application/solo.rb
+++ b/lib/chef/application/solo.rb
@@ -55,7 +55,7 @@ class Chef::Application::Solo < Chef::Application
option :color,
:long => '--[no-]color',
:boolean => true,
- :default => true,
+ :default => !Chef::Platform.windows?,
:description => "Use colored output, defaults to enabled"
option :log_level,