Skip to content
Snippets Groups Projects
Commit 3b524a04 authored by Markus Reiter's avatar Markus Reiter
Browse files

Output PKG contents if no version can be found.

parent d6f30a4b
No related branches found
No related tags found
No related merge requests found
......@@ -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
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment