diff --git a/bin/brew b/bin/brew index 2529693d60..3569560ae2 100755 --- a/bin/brew +++ b/bin/brew @@ -1,10 +1,6 @@ #!/usr/bin/ruby # -*- coding: utf-8 -*- -# Many Pathname operations use getwd when they shouldn't, and then throw -# odd exceptions. Reduce our support burden by showing a user-friendly error. -Dir.getwd rescue abort "The current working directory doesn't exist, cannot proceed." - HOMEBREW_BREW_FILE = ENV['HOMEBREW_BREW_FILE'] = File.expand_path(__FILE__) require 'pathname' @@ -41,6 +37,11 @@ if MACOS_VERSION < 10.5 EOABORT end +# Many Pathname operations use getwd when they shouldn't, and then throw +# odd exceptions. Reduce our support burden by showing a user-friendly error. +Dir.getwd rescue abort "The current working directory doesn't exist, cannot proceed." + + def require? path require path.to_s.chomp rescue LoadError => e