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

Ignore empty version strings.

Browse Source
This commit is contained in:
Markus Reiter 2020-12-06 23:47:12 +01:00
parent 933499089c
commit 91ce799fe2
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Library/Homebrew/dev-cmd/bump-unversioned-casks.rb
View File

@ -233,8 +233,8 @@ module Homebrew
def self.version_from_info_plist(info_plist_path) def self.version_from_info_plist(info_plist_path)
plist = system_command!("plutil", args: ["-convert", "xml1", "-o", "-", info_plist_path]).plist plist = system_command!("plutil", args: ["-convert", "xml1", "-o", "-", info_plist_path]).plist
short_version = plist["CFBundleShortVersionString"] short_version = plist["CFBundleShortVersionString"].presence
version = plist["CFBundleVersion"] version = plist["CFBundleVersion"].presence
return decide_between_versions(short_version, version) if short_version && version return decide_between_versions(short_version, version) if short_version && version
end end
@ -243,8 +243,8 @@ module Homebrew
def self.version_from_package_info(package_info_path) def self.version_from_package_info(package_info_path)
contents = package_info_path.read contents = package_info_path.read
short_version = contents[/CFBundleShortVersionString="([^"]*)"/, 1] short_version = contents[/CFBundleShortVersionString="([^"]*)"/, 1].presence
version = contents[/CFBundleVersion="([^"]*)"/, 1] version = contents[/CFBundleVersion="([^"]*)"/, 1].presence
return decide_between_versions(short_version, version) if short_version && version return decide_between_versions(short_version, version) if short_version && version
end end