Skip to content
Snippets Groups Projects
Commit 0c22cc45 authored by Kaito Udagawa's avatar Kaito Udagawa
Browse files

cask: Call Tempfile#close(true) with the choices file to ensure it deleted

parent 28072021
No related branches found
No related tags found
No related merge requests found
......@@ -54,17 +54,25 @@ module Hbc
]
args << "-verboseR" if Hbc.verbose
args << "-allowUntrusted" if pkg_install_opts :allow_untrusted
if pkg_install_opts :choices
choices_file = choices_xml
args << "-applyChoiceChangesXML" << choices_file.path
with_choices_file pkg_install_opts(:choices) do |choices_path|
args << "-applyChoiceChangesXML" << choices_path if choices_path
@command.run!("/usr/sbin/installer", sudo: true, args: args, print_stdout: true)
end
@command.run!("/usr/sbin/installer", sudo: true, args: args, print_stdout: true)
end
def choices_xml
file = Tempfile.open(["", ".xml"])
file.write Plist::Emit.dump(pkg_install_opts(:choices))
file
def with_choices_file(choices)
unless choices
yield nil
return
end
begin
file = Tempfile.new(["choices", ".xml"])
file.write Plist::Emit.dump(choices)
yield file.path
ensure
file.close(true)
end
end
end
end
......
......@@ -60,7 +60,9 @@ describe Hbc::Artifact::Pkg do
</plist>
EOS
file.stubs path: Pathname.new("/tmp/choices.xml")
Tempfile.expects(:open).returns(file)
file.expects(:close).with true
Tempfile.expects(:new).returns file
Hbc::FakeSystemCommand.expects_command(["/usr/bin/sudo", "-E", "--", "/usr/sbin/installer", "-pkg", @cask.staged_path.join("MyFancyPkg", "Fancy.pkg"), "-target", "/", "-applyChoiceChangesXML", @cask.staged_path.join("/tmp/choices.xml")])
shutup do
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment