aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKaito Udagawa2016-11-10 11:56:00 +0900
committerKaito Udagawa2016-11-19 04:41:21 +0900
commitf4a3bc100b4b98a3d06222c15934abb36bf16594 (patch)
tree0da2c51ec9bd50c9f201b8722e5d0124a1da36af
parent7853406fb40f9b2785cef805e6f9a19183ae3017 (diff)
downloadbrew-f4a3bc100b4b98a3d06222c15934abb36bf16594.tar.bz2
cask: add the choices option to pkg stanza
installer command accepts -applyChoiceChangesXML option to change customize options on the GUI installer from the commandline. (`man installer` for more detailed information) The introduced option `choice` enables the choice changes to be supplied via pkg stanza without tricks in preflight code.
-rw-r--r--Library/Homebrew/cask/lib/hbc/artifact/pkg.rb17
-rw-r--r--Library/Homebrew/cask/test/cask/artifact/pkg_test.rb37
-rw-r--r--Library/Homebrew/cask/test/support/Casks/with-choices.rb16
3 files changed, 69 insertions, 1 deletions
diff --git a/Library/Homebrew/cask/lib/hbc/artifact/pkg.rb b/Library/Homebrew/cask/lib/hbc/artifact/pkg.rb
index d5e63d8ef..2f34814ab 100644
--- a/Library/Homebrew/cask/lib/hbc/artifact/pkg.rb
+++ b/Library/Homebrew/cask/lib/hbc/artifact/pkg.rb
@@ -2,6 +2,8 @@ require "hbc/artifact/base"
require "hbc/utils/hash_validator"
+require "vendor/plist/plist"
+
module Hbc
module Artifact
class Pkg < Base
@@ -16,7 +18,7 @@ module Hbc
@pkg_install_opts = pkg_description.shift
begin
if @pkg_install_opts.respond_to?(:keys)
- @pkg_install_opts.extend(HashValidator).assert_valid_keys(:allow_untrusted)
+ @pkg_install_opts.extend(HashValidator).assert_valid_keys(:allow_untrusted, :choices)
elsif @pkg_install_opts
raise
end
@@ -52,8 +54,21 @@ module Hbc
]
args << "-verboseR" if Hbc.verbose
args << "-allowUntrusted" if pkg_install_opts :allow_untrusted
+ if pkg_install_opts :choices
+ args << "-applyChoiceChangesXML"
+ args << choices_xml
+ end
@command.run!("/usr/sbin/installer", sudo: true, args: args, print_stdout: true)
end
+
+ def choices_xml
+ path = @cask.staged_path.join("Choices.xml")
+ unless File.exist? path
+ choices = pkg_install_opts :choices
+ IO.write path, Plist::Emit.dump(choices)
+ end
+ path
+ end
end
end
end
diff --git a/Library/Homebrew/cask/test/cask/artifact/pkg_test.rb b/Library/Homebrew/cask/test/cask/artifact/pkg_test.rb
index e87db7a7a..8ee4e0a3c 100644
--- a/Library/Homebrew/cask/test/cask/artifact/pkg_test.rb
+++ b/Library/Homebrew/cask/test/cask/artifact/pkg_test.rb
@@ -30,4 +30,41 @@ describe Hbc::Artifact::Pkg do
end
end
end
+
+ describe "choices" do
+ before do
+ @cask = Hbc.load("with-choices")
+ shutup do
+ TestHelper.install_without_artifacts(@cask)
+ end
+ end
+
+ it "passes the choice changes xml to the system installer" do
+ pkg = Hbc::Artifact::Pkg.new(@cask,
+ command: Hbc::FakeSystemCommand)
+
+ 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("Choices.xml")])
+
+ shutup do
+ pkg.install_phase
+ end
+
+ IO.read(@cask.staged_path.join("Choices.xml")).must_equal <<-EOS.undent
+ <?xml version="1.0" encoding="UTF-8"?>
+ <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+ <plist version="1.0">
+ <array>
+ <dict>
+ <key>attributeSetting</key>
+ <integer>1</integer>
+ <key>choiceAttribute</key>
+ <string>selected</string>
+ <key>choiceIdentifier</key>
+ <string>choice1</string>
+ </dict>
+ </array>
+ </plist>
+ EOS
+ end
+ end
end
diff --git a/Library/Homebrew/cask/test/support/Casks/with-choices.rb b/Library/Homebrew/cask/test/support/Casks/with-choices.rb
new file mode 100644
index 000000000..1871efab3
--- /dev/null
+++ b/Library/Homebrew/cask/test/support/Casks/with-choices.rb
@@ -0,0 +1,16 @@
+test_cask 'with-choices' do
+ version '1.2.3'
+ sha256 '8c62a2b791cf5f0da6066a0a4b6e85f62949cd60975da062df44adf887f4370b'
+
+ url "file://#{TEST_FIXTURE_DIR}/cask/MyFancyPkg.zip"
+ homepage 'http://example.com/fancy-pkg'
+
+ pkg 'MyFancyPkg/Fancy.pkg',
+ choices: [
+ {
+ 'choiceIdentifier' => 'choice1',
+ 'choiceAttribute' => 'selected',
+ 'attributeSetting' => 1,
+ },
+ ]
+end