fbd526ffe6
The pkg stanza has an option called `allow_untrusted`, which is supposed to cause `/usr/sbin/installer` to be called with the `-allowUntrusted` switch. PR #3141 seems to have renamed the `pkg_install_opts` field to `options`. At the same time, it introduces an `options` parameter for the `run_installer` method, which shadows the `options` getter method, causing the `allow_untrusted` option to be silently ignored. The issue affects just the `pkg` stanza because `Hbc::Artifact::Pkg` is the only artifact class that has an `options` method. This commit removes the shadowing by renaming the field to `stanza_options`; in one case, it uses `_options` for a parameter name (instead of the more canonical `_`) for the sake of clarity.
74 lines
2.0 KiB
Ruby
74 lines
2.0 KiB
Ruby
require "hbc/artifact/abstract_artifact"
|
|
|
|
require "hbc/utils/hash_validator"
|
|
|
|
require "vendor/plist/plist"
|
|
|
|
module Hbc
|
|
module Artifact
|
|
class Pkg < AbstractArtifact
|
|
attr_reader :pkg_relative_path
|
|
|
|
def self.from_args(cask, path, **stanza_options)
|
|
stanza_options.extend(HashValidator).assert_valid_keys(
|
|
:allow_untrusted, :choices
|
|
)
|
|
new(cask, path, **stanza_options)
|
|
end
|
|
|
|
attr_reader :path, :stanza_options
|
|
|
|
def initialize(cask, path, **stanza_options)
|
|
super(cask)
|
|
@path = cask.staged_path.join(path)
|
|
@stanza_options = stanza_options
|
|
end
|
|
|
|
def summarize
|
|
path.relative_path_from(cask.staged_path).to_s
|
|
end
|
|
|
|
def install_phase(**options)
|
|
run_installer(**options)
|
|
end
|
|
|
|
private
|
|
|
|
def run_installer(command: nil, verbose: false, **_options)
|
|
ohai "Running installer for #{cask}; your password may be necessary."
|
|
ohai "Package installers may write to any location; options such as --appdir are ignored."
|
|
unless path.exist?
|
|
raise CaskError, "pkg source file not found: '#{path.relative_path_from(cask.staged_path)}'"
|
|
end
|
|
args = [
|
|
"-pkg", path,
|
|
"-target", "/"
|
|
]
|
|
args << "-verboseR" if verbose
|
|
if stanza_options.fetch(:allow_untrusted, false)
|
|
args << "-allowUntrusted"
|
|
end
|
|
with_choices_file do |choices_path|
|
|
args << "-applyChoiceChangesXML" << choices_path if choices_path
|
|
command.run!("/usr/sbin/installer", sudo: true, args: args, print_stdout: true)
|
|
end
|
|
end
|
|
|
|
def with_choices_file
|
|
choices = stanza_options.fetch(:choices, {})
|
|
return yield nil if choices.empty?
|
|
|
|
Tempfile.open(["choices", ".xml"]) do |file|
|
|
begin
|
|
file.write Plist::Emit.dump(choices)
|
|
file.close
|
|
yield file.path
|
|
ensure
|
|
file.unlink
|
|
end
|
|
end
|
|
end
|
|
end
|
|
end
|
|
end
|