diff options
| author | Vítor Galvão | 2017-02-05 12:57:03 +0000 |
|---|---|---|
| committer | GitHub | 2017-02-05 12:57:03 +0000 |
| commit | 8535a8cd7fd94abd09eebe0a9133decb1bf8c715 (patch) | |
| tree | 64902bf3e67ba07b94f4a03570ada74b219073c3 /Library/Homebrew | |
| parent | da9dd0a8633d826caac89bc0c6230caf542135b1 (diff) | |
| parent | 8113a9fed9fe6dcd41f6a382cb19e61c0abe2887 (diff) | |
| download | brew-8535a8cd7fd94abd09eebe0a9133decb1bf8c715.tar.bz2 | |
Merge pull request #1953 from reitermarkus/remove-xip
Remove XIP support.
Diffstat (limited to 'Library/Homebrew')
| -rw-r--r-- | Library/Homebrew/cask/lib/hbc/container.rb | 2 | ||||
| -rw-r--r-- | Library/Homebrew/cask/lib/hbc/container/xip.rb | 29 |
2 files changed, 0 insertions, 31 deletions
diff --git a/Library/Homebrew/cask/lib/hbc/container.rb b/Library/Homebrew/cask/lib/hbc/container.rb index e31fbc8fb..fc7246f3d 100644 --- a/Library/Homebrew/cask/lib/hbc/container.rb +++ b/Library/Homebrew/cask/lib/hbc/container.rb @@ -16,7 +16,6 @@ require "hbc/container/tar" require "hbc/container/ttf" require "hbc/container/rar" require "hbc/container/xar" -require "hbc/container/xip" require "hbc/container/xz" require "hbc/container/zip" @@ -34,7 +33,6 @@ module Hbc Sit, Rar, Zip, - Xip, # needs to be before xar as this is a cpio inside a gzip inside a xar Xar, # need to be before tar as tar can also list xar Tar, # or compressed tar (bzip2/gzip/lzma/xz) Bzip2, # pure bzip2 diff --git a/Library/Homebrew/cask/lib/hbc/container/xip.rb b/Library/Homebrew/cask/lib/hbc/container/xip.rb deleted file mode 100644 index 982402e4e..000000000 --- a/Library/Homebrew/cask/lib/hbc/container/xip.rb +++ /dev/null @@ -1,29 +0,0 @@ -require "tmpdir" - -module Hbc - class Container - class Xip < Base - def self.me?(criteria) - criteria.magic_number(/^xar!/n) && - IO.popen(["/usr/bin/xar", "-t", "-f", criteria.path.to_s], err: "/dev/null") { |io| io.read =~ /\AContent\nMetadata\n\Z/ } - end - - def extract - Dir.mktmpdir do |unpack_dir| - begin - ohai "Verifying signature for #{@path.basename}" - @command.run!("/usr/sbin/pkgutil", args: ["--check-signature", @path]) - rescue - raise "Signature check failed." - end - - @command.run!("/usr/bin/xar", args: ["-x", "-f", @path, "Content", "-C", unpack_dir]) - - Dir.chdir(@cask.staged_path) do - @command.run!("/usr/bin/cpio", args: ["--quiet", "-i", "-I", Pathname(unpack_dir).join("Content")]) - end - end - end - end - end -end |
