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

bottle: use formula path accessor

Browse Source
This commit is contained in:
Jack Nagel 2013-12-27 16:43:34 -06:00
parent c95b90a022
commit ec2cd31c1d
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Library/Homebrew/cmd/bottle.rb
View File

@ -202,10 +202,9 @@ module Homebrew extend self
if ARGV.include? '--write' if ARGV.include? '--write'
f = Formula.factory formula_name f = Formula.factory formula_name
formula_relative_path = "Library/Formula/#{f.name}.rb"
formula_path = HOMEBREW_REPOSITORY+formula_relative_path
has_bottle_block = f.class.bottle.checksums.any? has_bottle_block = f.class.bottle.checksums.any?
inreplace formula_path do |s|
inreplace f.path do |s|
if has_bottle_block if has_bottle_block
s.sub!(/ bottle do.+?end\n/m, output) s.sub!(/ bottle do.+?end\n/m, output)
else else
@ -217,7 +216,7 @@ module Homebrew extend self
safe_system 'git', 'commit', '--no-edit', '--verbose', safe_system 'git', 'commit', '--no-edit', '--verbose',
"--message=#{f.name}: #{update_or_add} #{f.version} bottle.", "--message=#{f.name}: #{update_or_add} #{f.version} bottle.",
'--', formula_path '--', f.path
end end
end end
exit 0 exit 0