Merge pull request #1953 from reitermarkus/remove-xip
Remove XIP support.
This commit is contained in:
commit
8535a8cd7f
@ -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
|
||||
|
@ -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
|
Loading…
x
Reference in New Issue
Block a user