diff options
| author | Mike McQuaid | 2015-02-23 14:49:10 +0000 |
|---|---|---|
| committer | Mike McQuaid | 2015-02-23 14:49:10 +0000 |
| commit | e50badf11c517f0be661da2050a02aa0b0554caa (patch) | |
| tree | f13bcb750551569e505bffe0a2830d241cd1e488 /Library | |
| parent | 7926ea171c84b8fe5439cb4969533f316a941d8e (diff) | |
| download | brew-e50badf11c517f0be661da2050a02aa0b0554caa.tar.bz2 | |
pull: use link_tap_formula method.
Diffstat (limited to 'Library')
| -rw-r--r-- | Library/Homebrew/cmd/pull.rb | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/Library/Homebrew/cmd/pull.rb b/Library/Homebrew/cmd/pull.rb index 8071fcd38..e0d7e94df 100644 --- a/Library/Homebrew/cmd/pull.rb +++ b/Library/Homebrew/cmd/pull.rb @@ -3,6 +3,7 @@ require 'utils' require 'formula' +require 'cmd/tap' module Homebrew def tap arg @@ -92,9 +93,9 @@ module Homebrew pull_url url changed_formulae = [] + changed_formulae_paths = [] if tap_dir - safe_system "brew", "tap", "--repair", "--debug" formula_dir = %w[Formula HomebrewFormula].find { |d| tap_dir.join(d).directory? } || "" else formula_dir = "Library/Formula" @@ -104,7 +105,9 @@ module Homebrew "git", "diff-tree", "-r", "--name-only", "--diff-filter=AM", revision, "HEAD", "--", formula_dir ).each_line do |line| - name = File.basename(line.chomp, ".rb") + line = line.chomp + name = File.basename(line, ".rb") + changed_formulae_paths << Pathname.new("#{formula_dir}/#{line}") begin changed_formulae << Formula[name] @@ -114,6 +117,8 @@ module Homebrew end end + link_tap_formula(changed_formulae_paths, false) + unless ARGV.include? '--bottle' changed_formulae.each do |f| next unless f.bottle |