From 3b524a04c2162da39bc996d9824fc114fd69f756 Mon Sep 17 00:00:00 2001 From: Markus Reiter Date: Mon, 7 Dec 2020 01:08:15 +0100 Subject: [PATCH] Output PKG contents if no version can be found. --- .../dev-cmd/bump-unversioned-casks.rb | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/Library/Homebrew/dev-cmd/bump-unversioned-casks.rb b/Library/Homebrew/dev-cmd/bump-unversioned-casks.rb index f98ccd3594..4997158213 100644 --- a/Library/Homebrew/dev-cmd/bump-unversioned-casks.rb +++ b/Library/Homebrew/dev-cmd/bump-unversioned-casks.rb @@ -213,22 +213,22 @@ module Homebrew next end - if packages.count == 1 - package_info_path = extract_dir/"PackageInfo" - if package_info_path.exist? - if (version = version_from_package_info(package_info_path)) - return version - end - else - onoe "#{pkg_path.basename} does not contain a `PackageInfo` file:" - $stderr.puts Pathname.glob(extract_dir/"**/*") - next + package_info_path = extract_dir/"PackageInfo" + if package_info_path.exist? + if (version = version_from_package_info(package_info_path)) + return version end - else - opoo "Skipping, #{pkg_path.basename} contains multiple packages (#{packages.join(", ")}):" - $stderr.puts Pathname.glob(extract_dir/"**/*") - next + 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 + + $stderr.puts Pathname.glob(extract_dir/"**/*") + .map { |path| + regex = %r{\A(.*?\.(app|qlgenerator|saver|plugin|kext|bundle|osax))/.*\Z} + path.to_s.sub(regex, '\1') + }.uniq ensure Cask::Utils.gain_permissions_remove(extract_dir) extract_dir.mkpath