aboutsummaryrefslogtreecommitdiffstats
path: root/Library/Homebrew/dev-cmd
diff options
context:
space:
mode:
authorilovezfs2018-01-24 04:22:11 -0800
committerilovezfs2018-01-24 04:22:11 -0800
commit5a3555eeee38fed0cadf4df94dc601a77b1f08ad (patch)
treef771e2bb2727cc4b5cb20ffdb1c354f825f95822 /Library/Homebrew/dev-cmd
parent4a1a8b86ac094621a50eff1526b53f62758ad1be (diff)
downloadbrew-5a3555eeee38fed0cadf4df94dc601a77b1f08ad.tar.bz2
bump-formula-pr: only validate tar files.
Diffstat (limited to 'Library/Homebrew/dev-cmd')
-rw-r--r--Library/Homebrew/dev-cmd/bump-formula-pr.rb17
1 files changed, 11 insertions, 6 deletions
diff --git a/Library/Homebrew/dev-cmd/bump-formula-pr.rb b/Library/Homebrew/dev-cmd/bump-formula-pr.rb
index 0094ae4f8..7069a4816 100644
--- a/Library/Homebrew/dev-cmd/bump-formula-pr.rb
+++ b/Library/Homebrew/dev-cmd/bump-formula-pr.rb
@@ -196,13 +196,18 @@ module Homebrew
resource.version = forced_version if forced_version
odie "No --version= argument specified!" unless resource.version
resource_path = resource.fetch
- gnu_tar_gtar_path = HOMEBREW_PREFIX/"opt/gnu-tar/bin/gtar"
- gnu_tar_gtar = gnu_tar_gtar_path if gnu_tar_gtar_path.executable?
- tar = which("gtar") || gnu_tar_gtar || which("tar")
- if Utils.popen_read(tar, "-tf", resource_path) =~ %r{/.*\.}
+ tar_file_extensions = %w[.tar .tb2 .tbz .tbz2 .tgz .tlz .txz .tZ]
+ if tar_file_extensions.any? { |extension| new_url.include? extension }
+ gnu_tar_gtar_path = HOMEBREW_PREFIX/"opt/gnu-tar/bin/gtar"
+ gnu_tar_gtar = gnu_tar_gtar_path if gnu_tar_gtar_path.executable?
+ tar = which("gtar") || gnu_tar_gtar || which("tar")
+ if Utils.popen_read(tar, "-tf", resource_path) =~ %r{/.*\.}
+ new_hash = resource_path.sha256
+ else
+ odie "#{resource_path} is not a valid tar file!"
+ end
+ else
new_hash = resource_path.sha256
- elsif new_url.include? ".tar"
- odie "#{formula}: no --url=/--#{hash_type}= arguments specified!"
end
end