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

os/mac: prefer newest Xcode when searching using mdfind

Browse Source 
We're currently returning the first match for `com.apple.dt.Xcode`,
which could be any version if a user has multiple installed.

Instead, let's try to find the newest if all our results have an
`Info.plist` that we can interrogate for the version.

Maybe resolves #18736?
This commit is contained in:
Carlo Cabrera 2024-11-08 20:33:40 +08:00 committed by Carlo Cabrera
parent a8a4c07361
commit 09fc83667c
No known key found for this signature in database
GPG Key ID: C74D447FC549A1D0
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Library/Homebrew/os/mac.rb
View File

@ -195,10 +195,15 @@ module OS
sig { params(ids: String).returns(T.nilable(Pathname)) } sig { params(ids: String).returns(T.nilable(Pathname)) }
def self.app_with_bundle_id(*ids) def self.app_with_bundle_id(*ids)
path = mdfind(*ids) require "bundle_version"
.reject { |p| p.include?("/Backups.backupdb/") }
.first paths = mdfind(*ids).filter_map do |bundle_path|
Pathname.new(path) if path.present? Pathname.new(bundle_path) if bundle_path.exclude?("/Backups.backupdb/")
end
return paths.first unless paths.all? { |bp| (bp/"Contents/Info.plist").exist? }
# Prefer newest one, if we can find it.
paths.max_by { |bundle_path| Homebrew::BundleVersion.from_info_plist(bundle_path/"Contents/Info.plist") }
end end
sig { params(ids: String).returns(T::Array[String]) } sig { params(ids: String).returns(T::Array[String]) }