From 5a3555eeee38fed0cadf4df94dc601a77b1f08ad Mon Sep 17 00:00:00 2001
From: ilovezfs
Date: Wed, 24 Jan 2018 04:22:11 -0800
Subject: bump-formula-pr: only validate tar files.

---
 Library/Homebrew/dev-cmd/bump-formula-pr.rb | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

(limited to 'Library/Homebrew/dev-cmd')

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
 
-- 
cgit v1.2.3