CHEF-4259: Fix unpacking recipes with non-gnu tar

This probably isn't enough to handle every ancient version of tar, but
at least it fixes unpacking on SmartOS which is based on fairly recent
illumos. Also related to CHEF-1201.

2 files changed, 2 insertions, 2 deletions

diff --git a/lib/chef/application/solo.rb b/lib/chef/application/solo.rb
index b2fe91baed..7e316dc260 100644
--- a/lib/chef/application/solo.rb
+++ b/lib/chef/application/solo.rb
@@ -215,7 +215,7 @@ class Chef::Application::Solo < Chef::Application
           f.write(r.read)
         end
       end
-      Chef::Mixin::Command.run_command(:command => "tar zxvfC #{path} #{recipes_path}")
+      Chef::Mixin::Command.run_command(:command => "tar zxvf #{path} -C #{recipes_path}")
     end
   end
 
diff --git a/spec/unit/application/solo_spec.rb b/spec/unit/application/solo_spec.rb
index 96c89a37a6..07598dd01c 100644
--- a/spec/unit/application/solo_spec.rb
+++ b/spec/unit/application/solo_spec.rb
@@ -136,7 +136,7 @@ describe Chef::Application::Solo do
       end
 
       it "should untar the target file to the parent of the cookbook path" do
-        Chef::Mixin::Command.should_receive(:run_command).with({:command => "tar zxvfC #{Dir.tmpdir}/chef-solo/recipes.tgz #{Dir.tmpdir}/chef-solo"}).and_return(true)
+        Chef::Mixin::Command.should_receive(:run_command).with({:command => "tar zxvf #{Dir.tmpdir}/chef-solo/recipes.tgz -C #{Dir.tmpdir}/chef-solo"}).and_return(true)
         @app.reconfigure
       end
     end