Fixing up merge errors

chef-boneyard · Dec 22, 2013 · 279321b · jeroenj · Jan 30, 2014 · 279321b
1 parent ef5d913
commit 279321b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/providers/package.rb b/providers/package.rb
@@ -47,7 +47,7 @@ def load_current_resource
         software_license_agreement = system("hdiutil imageinfo #{passphrase_cmd} '#{dmg_file}' | grep -q 'Software License Agreement: true'")
         fail "Requires EULA Acceptance; add 'accept_eula true' to package resource" if software_license_agreement && !new_resource.accept_eula
         accept_eula_cmd = new_resource.accept_eula ? 'echo Y |' : ''
-        system "#{accept_eula_cmd} hdiutil attach #{passphrase_cmd} '#{dmg_file}'"
+        puts "#{accept_eula_cmd} hdiutil attach #{passphrase_cmd} '#{dmg_file}'"
       end
       not_if "hdiutil info #{passphrase_cmd} | grep -q 'image-path.*#{dmg_file}'"
     end

diff --git a/resources/package.rb b/resources/package.rb
@@ -21,7 +21,7 @@
 attribute :app, :kind_of => String, :name_attribute => true
 attribute :source, :kind_of => String, :default => nil
 attribute :owner, :kind_of => String, :default => nil
-attribute :destination, :kind_of => String, :default => '/Applications'
+attribute :destination, :kind_of => String, :default => "/Applications"
 attribute :checksum, :kind_of => String, :default => nil
 attribute :volumes_dir, :kind_of => String, :default => nil
 attribute :dmg_name, :kind_of => String, :default => nil