Only Chef Software binaries should enforce EULA

Signed-off-by: tyler-ball <tball@chef.io>

6 files changed, 9 insertions, 7 deletions

diff --git a/chef-bin/bin/chef-apply b/chef-bin/bin/chef-apply
index ddbdc66907..f9f01710b2 100755
--- a/chef-bin/bin/chef-apply
+++ b/chef-bin/bin/chef-apply
@@ -21,4 +21,4 @@
 $:.unshift(File.join(File.dirname(__FILE__), "..", "lib"))
 require "chef/application/apply"
 
-Chef::Application::Apply.new.run
+Chef::Application::Apply.new.run(true)
diff --git a/chef-bin/bin/chef-client b/chef-bin/bin/chef-client
index af27d7903d..df0a18f9a6 100755
--- a/chef-bin/bin/chef-client
+++ b/chef-bin/bin/chef-client
@@ -22,4 +22,4 @@ $:.unshift(File.join(File.dirname(__FILE__), "..", "lib"))
 require "chef"
 require "chef/application/client"
 
-Chef::Application::Client.new.run
+Chef::Application::Client.new.run(true)
diff --git a/chef-bin/bin/chef-solo b/chef-bin/bin/chef-solo
index 06c0452d26..2768f3224c 100755
--- a/chef-bin/bin/chef-solo
+++ b/chef-bin/bin/chef-solo
@@ -21,4 +21,4 @@
 $:.unshift(File.join(File.dirname(__FILE__), "..", "lib"))
 require "chef/application/solo"
 
-Chef::Application::Solo.new.run
+Chef::Application::Solo.new.run(true)
diff --git a/lib/chef/application.rb b/lib/chef/application.rb
index 2970921d1e..f567e62806 100644
--- a/lib/chef/application.rb
+++ b/lib/chef/application.rb
@@ -61,11 +61,11 @@ class Chef
     end
 
     # Get this party started
-    def run
+    def run(enforce_license = false)
       setup_signal_handlers
       reconfigure
       setup_application
-      check_license_acceptance
+      check_license_acceptance if enforce_license
       run_application
     end
 
diff --git a/lib/chef/application/apply.rb b/lib/chef/application/apply.rb
index 34f0973b40..715e0152d2 100644
--- a/lib/chef/application/apply.rb
+++ b/lib/chef/application/apply.rb
@@ -214,8 +214,9 @@ class Chef::Application::Apply < Chef::Application
   end
 
     # Get this party started
-  def run
+  def run(enforce_license = false)
     reconfigure
+    check_license_acceptance if enforce_license
     run_application
   end
 
diff --git a/lib/chef/application/solo.rb b/lib/chef/application/solo.rb
index 04cc9265ff..4a3957146e 100644
--- a/lib/chef/application/solo.rb
+++ b/lib/chef/application/solo.rb
@@ -217,10 +217,11 @@ class Chef::Application::Solo < Chef::Application
   attr_reader :chef_client_json
 
   # Get this party started
-  def run
+  def run(enforce_license = false)
     setup_signal_handlers
     setup_application
     reconfigure
+    check_license_acceptance if enforce_license
     for_ezra if Chef::Config[:ez]
     if !Chef::Config[:solo_legacy_mode]
       Chef::Application::Client.new.run