admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

Merge pull request #2761 from sjackman/bottleloader-url-homebrew

Browse Source 
BottleLoader: Fix installing a bottle from an URL
This commit is contained in:
Mike McQuaid 2017-06-16 14:19:01 +01:00 committed by GitHub
commit 3b376bfa2f
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Library/Homebrew/formulary.rb
View File

@ -108,7 +108,8 @@ module Formulary
case bottle_name case bottle_name
when %r{(https?|ftp|file)://} when %r{(https?|ftp|file)://}
# The name of the formula is found between the last slash and the last hyphen. # The name of the formula is found between the last slash and the last hyphen.
resource = Resource.new bottle_name[%r{([^/]+)-}, 1] { url bottle_name } formula_name = File.basename(bottle_name)[/(.+)-/, 1]
resource = Resource.new(formula_name) { url bottle_name }
downloader = CurlBottleDownloadStrategy.new resource.name, resource downloader = CurlBottleDownloadStrategy.new resource.name, resource
@bottle_filename = downloader.cached_location @bottle_filename = downloader.cached_location
cached = @bottle_filename.exist? cached = @bottle_filename.exist?