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

bump-formula-pr: use "resource" not "rsrc"

Browse Source
This commit is contained in:
ilovezfs 2018-01-24 03:51:23 -08:00
parent 60a30e966b
commit 4a1a8b86ac
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Library/Homebrew/dev-cmd/bump-formula-pr.rb
View File

@ -184,23 +184,23 @@ module Homebrew
elsif !new_url elsif !new_url
odie "#{formula}: no --url= argument specified!" odie "#{formula}: no --url= argument specified!"
else else
rsrc_url = if requested_spec != :devel && new_url =~ /.*ftpmirror.gnu.*/ resource_url = if requested_spec != :devel && new_url =~ /.*ftpmirror.gnu.*/
new_mirror = new_url.sub "ftpmirror.gnu.org", "ftp.gnu.org/gnu" new_mirror = new_url.sub "ftpmirror.gnu.org", "ftp.gnu.org/gnu"
new_mirror new_mirror
else else
new_url new_url
end end
rsrc = Resource.new { @url = rsrc_url } resource = Resource.new { @url = resource_url }
rsrc.download_strategy = CurlDownloadStrategy resource.download_strategy = CurlDownloadStrategy
rsrc.owner = Resource.new(formula.name) resource.owner = Resource.new(formula.name)
rsrc.version = forced_version if forced_version resource.version = forced_version if forced_version
odie "No --version= argument specified!" unless rsrc.version odie "No --version= argument specified!" unless resource.version
rsrc_path = rsrc.fetch resource_path = resource.fetch
gnu_tar_gtar_path = HOMEBREW_PREFIX/"opt/gnu-tar/bin/gtar" gnu_tar_gtar_path = HOMEBREW_PREFIX/"opt/gnu-tar/bin/gtar"
gnu_tar_gtar = gnu_tar_gtar_path if gnu_tar_gtar_path.executable? gnu_tar_gtar = gnu_tar_gtar_path if gnu_tar_gtar_path.executable?
tar = which("gtar") || gnu_tar_gtar || which("tar") tar = which("gtar") || gnu_tar_gtar || which("tar")
if Utils.popen_read(tar, "-tf", rsrc_path) =~ %r{/.*\.} if Utils.popen_read(tar, "-tf", resource_path) =~ %r{/.*\.}
new_hash = rsrc_path.sha256 new_hash = resource_path.sha256
elsif new_url.include? ".tar" elsif new_url.include? ".tar"
odie "#{formula}: no --url=/--#{hash_type}= arguments specified!" odie "#{formula}: no --url=/--#{hash_type}= arguments specified!"
end end