admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

Merge pull request #9543 from reitermarkus/unversioned-pkgs

Browse Source 
Add `top_level_info_plists` helper method.
This commit is contained in:
Markus Reiter 2020-12-16 06:48:59 +01:00 committed by GitHub
commit 6b3555eb90
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 38 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
Library/Homebrew/unversioned_cask_checker.rb
View File

@ -46,6 +46,20 @@ module Homebrew
pkgs.count == 1
end
# Filter paths to `Info.plist` files so that ones belonging
# to e.g. nested `.app`s are ignored.
sig { params(paths: T::Array[Pathname]).returns(T::Array[Pathname]) }
def top_level_info_plists(paths)
# Go from `./Contents/Info.plist` to `./`.
top_level_paths = paths.map { |path| path.parent.parent }
paths.reject do |path|
top_level_paths.any? do |_other_top_level_path|
path.ascend.drop(3).any? { |parent_path| top_level_paths.include?(parent_path) }
end
end
end
sig { returns(T.nilable(String)) }
def guess_cask_version
if apps.empty? && pkgs.empty?
@ -64,15 +78,12 @@ module Homebrew
end
info_plist_paths = apps.flat_map do |app|
Pathname.glob(dir/"**"/app.source.basename/"Contents"/"Info.plist").reject do |info_plist_path|
# Ignore nested apps.
info_plist_path.parent.parent.parent.ascend.any? { |p| p.extname == ".app" }
end.sort
top_level_info_plists(Pathname.glob(dir/"**"/app.source.basename/"Contents"/"Info.plist")).sort
end
info_plist_paths.each do |info_plist_path|
if (version = BundleVersion.from_info_plist(info_plist_path)&.nice_version)
return version
if (version = BundleVersion.from_info_plist(info_plist_path))
return version.nice_version
end
end
@ -85,7 +96,6 @@ module Homebrew
system_command!("installer", args: ["-plist", "-pkginfo", "-pkg", pkg_path])
.plist
.map { |package| package.fetch("Package") }
.uniq
Dir.mktmpdir do |extract_dir|
extract_dir = Pathname(extract_dir)
@ -98,16 +108,34 @@ module Homebrew
next
end
top_level_info_plist_paths = top_level_info_plists(Pathname.glob(extract_dir/"**/Contents/Info.plist"))
unique_info_plist_versions =
top_level_info_plist_paths.map { |i| BundleVersion.from_info_plist(i)&.nice_version }
.compact.uniq
return unique_info_plist_versions.first if unique_info_plist_versions.count == 1
package_info_path = extract_dir/"PackageInfo"
if package_info_path.exist?
if (version = BundleVersion.from_package_info(package_info_path)&.nice_version)
return version
if (version = BundleVersion.from_package_info(package_info_path))
return version.nice_version
end
elsif packages.count == 1
onoe "#{pkg_path.basename} does not contain a `PackageInfo` file."
end
opoo "#{pkg_path.basename} contains multiple packages: (#{packages.join(", ")})" if packages.count != 1
distribution_path = extract_dir/"Distribution"
if distribution_path.exist?
Homebrew.install_bundler_gems!
require "nokogiri"
xml = Nokogiri::XML(distribution_path.read)
product_version = xml.xpath("//installer-gui-script//product").first&.attr("version")
return product_version if product_version
end
opoo "#{pkg_path.basename} contains multiple packages: #{packages}" if packages.count != 1
$stderr.puts Pathname.glob(extract_dir/"**/*")
.map { |path|