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

bump-formula-pr: style fixes

Browse Source
This commit is contained in:
ilovezfs 2016-09-27 03:30:40 -07:00
parent ff51e09e17
commit 5247cb83d7
1 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -120,11 +120,10 @@ module Homebrew
rsrc.download_strategy = CurlDownloadStrategy rsrc.download_strategy = CurlDownloadStrategy
rsrc.owner = Resource.new(formula.name) rsrc.owner = Resource.new(formula.name)
rsrc_path = rsrc.fetch rsrc_path = rsrc.fetch
if Utils.popen_read("/usr/bin/tar", "-tf", rsrc_path) =~ /\/.*\./ if Utils.popen_read("/usr/bin/tar", "-tf", rsrc_path) =~ %r{/.*\.}
new_hash = rsrc_path.sha256
else
odie "#{formula}: no url/#{hash_type} specified!" if new_url.include?(".tar")
new_hash = rsrc_path.sha256 new_hash = rsrc_path.sha256
elsif new_url.include? ".tar"
odie "#{formula}: no url/#{hash_type} specified!"
end end
end end
@ -141,9 +140,7 @@ module Homebrew
replacement_pairs << [/^ revision \d+\n(\n( head "))?/m, "\\2"] replacement_pairs << [/^ revision \d+\n(\n( head "))?/m, "\\2"]
end end
if requested_spec == :stable replacement_pairs << [/(^ mirror .*\n)?/, ""] if requested_spec == :stable
replacement_pairs << [/(^ mirror .*\n)?/, ""]
end
replacement_pairs += if new_url_hash replacement_pairs += if new_url_hash
[ [
@ -167,13 +164,11 @@ module Homebrew
if requested_spec == :stable if requested_spec == :stable
if File.read(formula.path).include?("version \"#{old_formula_version}\"") if File.read(formula.path).include?("version \"#{old_formula_version}\"")
replacement_pairs << [old_formula_version.to_s, forced_version] replacement_pairs << [old_formula_version.to_s, forced_version]
else elsif new_mirror
if new_mirror
replacement_pairs << [/^( +)(mirror \"#{new_mirror}\"\n)/m, "\\1\\2\\1version \"#{forced_version}\"\n"] replacement_pairs << [/^( +)(mirror \"#{new_mirror}\"\n)/m, "\\1\\2\\1version \"#{forced_version}\"\n"]
else else
replacement_pairs << [/^( +)(url \"#{new_url}\"\n)/m, "\\1\\2\\1version \"#{forced_version}\"\n"] replacement_pairs << [/^( +)(url \"#{new_url}\"\n)/m, "\\1\\2\\1version \"#{forced_version}\"\n"]
end end
end
elsif requested_spec == :devel elsif requested_spec == :devel
replacement_pairs << [/( devel do.+?version \")#{old_formula_version}(\"\n.+?end\n)/m, "\\1#{forced_version}\\2"] replacement_pairs << [/( devel do.+?version \")#{old_formula_version}(\"\n.+?end\n)/m, "\\1#{forced_version}\\2"]
end end