From ca3fccaf2b4bfe5c4d96a17ac5559f3721d00230 Mon Sep 17 00:00:00 2001 From: Kevin Abel Date: Mon, 12 Feb 2018 14:22:10 -0600 Subject: [PATCH] Make ext use bounded iterator --- Library/Homebrew/download_strategy.rb | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/Library/Homebrew/download_strategy.rb b/Library/Homebrew/download_strategy.rb index ed316fa7fb..e85661d76d 100644 --- a/Library/Homebrew/download_strategy.rb +++ b/Library/Homebrew/download_strategy.rb @@ -303,12 +303,11 @@ class AbstractFileDownloadStrategy < AbstractDownloadStrategy # We can't use basename_without_params, because given a URL like # https://example.com/download.php?file=foo-1.0.tar.gz # the extension we want is ".tar.gz", not ".php". - url_pathname = Pathname.new(@url) - until ext = url_pathname.extname[/[^?]+/] - url_pathname = url_pathname.dirname - return if url_pathname.to_s == "." || url_pathname.to_s == "/" + Pathname.new(@url).ascend do |path| + ext = path.extname[/[^?]+/] + return ext if ext end - ext + nil end end