Merge pull request #4867 from willoucom/untar-under-windows

cookbook site install : tar error on windows

1 files changed, 7 insertions, 2 deletions

diff --git a/lib/chef/knife/cookbook_site_install.rb b/lib/chef/knife/cookbook_site_install.rb
index 802fdd792b..45f3061d87 100644
--- a/lib/chef/knife/cookbook_site_install.rb
+++ b/lib/chef/knife/cookbook_site_install.rb
@@ -141,10 +141,15 @@ class Chef
 
       def extract_cookbook(upstream_file, version)
         ui.info("Uncompressing #{@cookbook_name} version #{version}.")
-        # FIXME: Detect if we have the bad tar from git on Windows: https://github.com/opscode/chef/issues/1753
         extract_command = "tar zxvf \"#{convert_path upstream_file}\""
         if Chef::Platform.windows?
-          extract_command << " --force-local"
+          tar_version = shell_out("tar --version").stdout.tr("\n", " ")
+          if tar_version =~ /GNU tar/
+            Chef::Log.debug("GNU tar detected, adding --force-local")
+            extract_command << " --force-local"
+          else
+            Chef::Log.debug("non-GNU tar detected, not adding --force-local")
+          end
         end
         shell_out!(extract_command, :cwd => @install_path)
       end