[DRE-commits] [test-kitchen] 05/13: Search for support/ in /usr/share/test-kitchen/

[Hleb Valoshka]

This is an automated email from the git hooks/post-receive script.

tsfgnu-guest pushed a commit to branch patch-queue/master
in repository test-kitchen.

commit aaf6d43ff07ae689837780563cc1767ed6f9c717
Author: Hleb Valoshka <375gnu at gmail.com>
Date:   Tue Jun 30 17:37:00 2015 +0300

    Search for support/ in /usr/share/test-kitchen/
---
 lib/kitchen/provisioner/base.rb      | 2 +-
 lib/kitchen/provisioner/chef_zero.rb | 4 ++--
 lib/kitchen/util.rb                  | 2 +-
 lib/kitchen/verifier/base.rb         | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/lib/kitchen/provisioner/base.rb b/lib/kitchen/provisioner/base.rb
index edbd4b7..bce54a5 100644
--- a/lib/kitchen/provisioner/base.rb
+++ b/lib/kitchen/provisioner/base.rb
@@ -195,7 +195,7 @@ module Kitchen
       def shell_code_from_file(vars, file)
         src_file = File.join(
           File.dirname(__FILE__),
-          %w[.. .. .. support],
+          %w[.. .. .. .. .. share test-kitchen support],
           file + (powershell_shell? ? ".ps1" : ".sh")
         )
 
diff --git a/lib/kitchen/provisioner/chef_zero.rb b/lib/kitchen/provisioner/chef_zero.rb
index 6b0ca80..5783698 100644
--- a/lib/kitchen/provisioner/chef_zero.rb
+++ b/lib/kitchen/provisioner/chef_zero.rb
@@ -198,7 +198,7 @@ module Kitchen
         debug("Using a vendored chef-client-zero.rb")
 
         source = File.join(File.dirname(__FILE__),
-          %w[.. .. .. support chef-client-zero.rb])
+          %w[.. .. .. .. .. share test-kitchen support chef-client-zero.rb])
         FileUtils.cp(source, File.join(sandbox_path, "chef-client-zero.rb"))
       end
 
@@ -224,7 +224,7 @@ module Kitchen
         debug("Using a dummy validation.pem")
 
         source = File.join(File.dirname(__FILE__),
-          %w[.. .. .. support dummy-validation.pem])
+          %w[.. .. .. .. .. share test-kitchen support dummy-validation.pem])
         FileUtils.cp(source, File.join(sandbox_path, "validation.pem"))
       end
 
diff --git a/lib/kitchen/util.rb b/lib/kitchen/util.rb
index 19dada2..1de0204 100644
--- a/lib/kitchen/util.rb
+++ b/lib/kitchen/util.rb
@@ -140,7 +140,7 @@ module Kitchen
     # @return [String] a string representation of useful helper functions
     def self.shell_helpers
       IO.read(File.join(
-        File.dirname(__FILE__), %w[.. .. support download_helpers.sh]
+        File.dirname(__FILE__), %w[.. .. .. .. share test-kitchen support download_helpers.sh]
       ))
     end
   end
diff --git a/lib/kitchen/verifier/base.rb b/lib/kitchen/verifier/base.rb
index 1bfaa23..52237d5 100644
--- a/lib/kitchen/verifier/base.rb
+++ b/lib/kitchen/verifier/base.rb
@@ -202,7 +202,7 @@ module Kitchen
       def shell_code_from_file(vars, file)
         src_file = File.join(
           File.dirname(__FILE__),
-          %w[.. .. .. support],
+          %w[.. .. .. .. .. share test-kitchen support],
           file + (powershell_shell? ? ".ps1" : ".sh")
         )
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/test-kitchen.git