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

Move the Dir.getwd after help

Browse Source 
Because we should always be able to help. And I've checked, it works fine.
This commit is contained in:
Max Howell 2011-03-13 13:42:32 +00:00
parent ec9cbc6466
commit 69361de450
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
bin/brew
View File

@ -1,10 +1,6 @@
#!/usr/bin/ruby #!/usr/bin/ruby
# -*- coding: utf-8 -*- # -*- 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__) HOMEBREW_BREW_FILE = ENV['HOMEBREW_BREW_FILE'] = File.expand_path(__FILE__)
require 'pathname' require 'pathname'
@ -41,6 +37,11 @@ if MACOS_VERSION < 10.5
EOABORT EOABORT
end 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 def require? path
require path.to_s.chomp require path.to_s.chomp
rescue LoadError => e rescue LoadError => e