From a31393f2cd16944ac75b0e24341990eb7df691be Mon Sep 17 00:00:00 2001 From: Jack Nagel Date: Sun, 27 Apr 2014 19:45:18 -0500 Subject: [PATCH] Fix brew-readall for updated tap structure --- Library/Contributions/cmd/brew-readall.rb | 44 ++++++++++++----------- 1 file changed, 24 insertions(+), 20 deletions(-) diff --git a/Library/Contributions/cmd/brew-readall.rb b/Library/Contributions/cmd/brew-readall.rb index 5316fbbd6d..3707f5a060 100755 --- a/Library/Contributions/cmd/brew-readall.rb +++ b/Library/Contributions/cmd/brew-readall.rb @@ -6,26 +6,30 @@ require 'formula' require 'cmd/tap' -formulae = [] -if ARGV.empty? - formulae = Formula.names -else - tap_name = ARGV.first - # Allow use of e.g. homebrew/versions or homebrew-versions - tap_dir = tap_name.reverse.sub('/', '-').reverse - tap = Pathname("#{HOMEBREW_LIBRARY}/Taps/#{tap_dir}") - raise "#{tap} does not exist!" unless tap.exist? - tap.find_formula do |f| - formulae << tap/f +module Homebrew + def readall + formulae = [] + if ARGV.empty? + formulae = Formula.names + else + user, repo = tap_args + user.downcase! + repo.downcase! + tap = HOMEBREW_LIBRARY/"Taps/#{user}/homebrew-#{repo}" + raise "#{tap} does not exist!" unless tap.directory? + tap.find_formula { |f| formulae << f } + end + + formulae.sort.each do |n| + begin + Formula.factory(n) + rescue Exception => e + onoe "problem in #{Formula.path(n)}" + puts e + Homebrew.failed = true + end + end end end -formulae.sort.each do |n| - begin - Formula.factory(n) - rescue Exception => e - onoe "problem in #{Formula.path(n)}" - puts e - Homebrew.failed = true - end -end +Homebrew.readall