install: move requires to top of file

This commit is contained in:
Jack Nagel 2014-06-16 13:36:17 -05:00
parent e91f359a56
commit f3817b58ee

View File

@ -1,6 +1,9 @@
require 'formula_installer' require "blacklist"
require 'hardware' require "cmd/doctor"
require 'blacklist' require "cmd/search"
require "cmd/tap"
require "formula_installer"
require "hardware"
module Homebrew extend self module Homebrew extend self
def install def install
@ -17,7 +20,6 @@ module Homebrew extend self
raise "No available formula for #{name}\n#{msg}" if msg raise "No available formula for #{name}\n#{msg}" if msg
end end
if not File.exist? name and name =~ HOMEBREW_TAP_FORMULA_REGEX then if not File.exist? name and name =~ HOMEBREW_TAP_FORMULA_REGEX then
require 'cmd/tap'
install_tap $1, $2 install_tap $1, $2
end end
end unless ARGV.force? end unless ARGV.force?
@ -28,7 +30,6 @@ module Homebrew extend self
ARGV.formulae.each { |f| install_formula(f) } ARGV.formulae.each { |f| install_formula(f) }
rescue FormulaUnavailableError => e rescue FormulaUnavailableError => e
ofail e.message ofail e.message
require 'cmd/search'
puts 'Searching taps...' puts 'Searching taps...'
puts_columns(search_taps(query_regexp(e.name))) puts_columns(search_taps(query_regexp(e.name)))
end end
@ -49,7 +50,6 @@ module Homebrew extend self
end end
def check_xcode def check_xcode
require 'cmd/doctor'
checks = Checks.new checks = Checks.new
%w[ %w[
check_for_installed_developer_tools check_for_installed_developer_tools