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

Map pkginfo versions to actual XQuartz versions

Browse Source
This commit is contained in:
Jack Nagel 2013-07-21 19:11:06 -05:00
parent 34623b4ef1
commit 9b30fc4afa
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Library/Homebrew/os/mac/xquartz.rb
View File

@ -3,6 +3,17 @@ module MacOS::XQuartz extend self
APPLE_BUNDLE_ID = "org.x.X11" APPLE_BUNDLE_ID = "org.x.X11"
FORGE_PKG_ID = "org.macosforge.xquartz.pkg" FORGE_PKG_ID = "org.macosforge.xquartz.pkg"
PKGINFO_VERSION_MAP = {
"2.6.34" => "2.6.3",
"2.7.4" => "2.7.0",
"2.7.14" => "2.7.1",
"2.7.28" => "2.7.2",
"2.7.32" => "2.7.3",
"2.7.43" => "2.7.4",
"2.7.50" => "2.7.5_rc1",
"2.7.51" => "2.7.5_rc2",
}.freeze
# This returns the version number of XQuartz, not of the upstream X.org. # This returns the version number of XQuartz, not of the upstream X.org.
# The X11.app distributed by Apple is also XQuartz, and therefore covered # The X11.app distributed by Apple is also XQuartz, and therefore covered
# by this method. # by this method.
@ -47,10 +58,9 @@ module MacOS::XQuartz extend self
# Upstream XQuartz *does* have a pkg-info entry, so if we can't get it # Upstream XQuartz *does* have a pkg-info entry, so if we can't get it
# from mdls, we can try pkgutil. This is very slow. # from mdls, we can try pkgutil. This is very slow.
# NOTE: this sacrifices correctness, as it returns an internal version
# that may not always match the "user-facing" version string.
def version_from_pkgutil def version_from_pkgutil
MacOS.pkgutil_info(FORGE_PKG_ID)[/version: (\d\.\d\.\d).+$/, 1] str = MacOS.pkgutil_info(FORGE_PKG_ID)[/version: (\d\.\d\.\d+)$/, 1]
PKGINFO_VERSION_MAP.fetch(str, str)
end end
def provided_by_apple? def provided_by_apple?