Remove requires path_helper from provider class, add to provider subclasses using PathHelper.

8 files changed, 7 insertions, 1 deletions

diff --git a/lib/chef/provider.rb b/lib/chef/provider.rb
index b25f83363b..bdfe826944 100644
--- a/lib/chef/provider.rb
+++ b/lib/chef/provider.rb
@@ -22,7 +22,6 @@ require 'chef/mixin/convert_to_class_name'
 require 'chef/mixin/enforce_ownership_and_permissions'
 require 'chef/mixin/why_run'
 require 'chef/mixin/shell_out'
-require 'chef/util/path_helper'
 
 class Chef
   class Provider
diff --git a/lib/chef/provider/deploy.rb b/lib/chef/provider/deploy.rb
index d443093707..db147278c2 100644
--- a/lib/chef/provider/deploy.rb
+++ b/lib/chef/provider/deploy.rb
@@ -22,6 +22,7 @@ require "chef/monkey_patches/fileutils"
 require "chef/provider/git"
 require "chef/provider/subversion"
 require "chef/dsl/recipe"
+require "chef/util/path_helper"
 
 class Chef
   class Provider
diff --git a/lib/chef/provider/dsc_script.rb b/lib/chef/provider/dsc_script.rb
index 5d7322842c..c979800cba 100644
--- a/lib/chef/provider/dsc_script.rb
+++ b/lib/chef/provider/dsc_script.rb
@@ -19,6 +19,7 @@
 require 'chef/util/powershell/cmdlet'
 require 'chef/util/dsc/configuration_generator'
 require 'chef/util/dsc/local_configuration_manager'
+require 'chef/util/path_helper'
 
 class Chef
   class Provider
diff --git a/lib/chef/provider/link.rb b/lib/chef/provider/link.rb
index af2fe4a84f..639dc4f3ff 100644
--- a/lib/chef/provider/link.rb
+++ b/lib/chef/provider/link.rb
@@ -22,6 +22,7 @@ require 'chef/mixin/file_class'
 require 'chef/resource/link'
 require 'chef/provider'
 require 'chef/scan_access_control'
+require 'chef/util/path_helper'
 
 class Chef
   class Provider
diff --git a/lib/chef/provider/package/freebsd/pkg.rb b/lib/chef/provider/package/freebsd/pkg.rb
index 01dc1e2eaa..ebbfbb19b4 100644
--- a/lib/chef/provider/package/freebsd/pkg.rb
+++ b/lib/chef/provider/package/freebsd/pkg.rb
@@ -20,6 +20,7 @@
 #
 
 require 'chef/provider/package/freebsd/base'
+require 'chef/util/path_helper'
 
 class Chef
   class Provider
diff --git a/lib/chef/provider/package/portage.rb b/lib/chef/provider/package/portage.rb
index 831ef0ec2f..816e262ab0 100644
--- a/lib/chef/provider/package/portage.rb
+++ b/lib/chef/provider/package/portage.rb
@@ -19,6 +19,7 @@
 require 'chef/provider/package'
 require 'chef/mixin/command'
 require 'chef/resource/package'
+require 'chef/util/path_helper'
 
 class Chef
   class Provider
diff --git a/lib/chef/provider/service/macosx.rb b/lib/chef/provider/service/macosx.rb
index 3924f28c48..ad1535327b 100644
--- a/lib/chef/provider/service/macosx.rb
+++ b/lib/chef/provider/service/macosx.rb
@@ -19,6 +19,7 @@
 require 'rexml/document'
 require 'chef/resource/service'
 require 'chef/provider/service/simple'
+require 'chef/util/path_helper'
 
 class Chef
   class Provider
diff --git a/lib/chef/provider/user/dscl.rb b/lib/chef/provider/user/dscl.rb
index a9edc29363..84f5145c52 100644
--- a/lib/chef/provider/user/dscl.rb
+++ b/lib/chef/provider/user/dscl.rb
@@ -20,6 +20,7 @@ require 'mixlib/shellout'
 require 'chef/provider/user'
 require 'openssl'
 require 'plist'
+require 'chef/util/path_helper'
 
 class Chef
   class Provider