diff options
| author | Jack Nagel | 2012-09-06 10:38:58 -0500 |
|---|---|---|
| committer | Jack Nagel | 2012-09-06 10:40:55 -0500 |
| commit | c227792bc16c930d637ef3a255b1848cf8eb9aa6 (patch) | |
| tree | 63ced2cb01195ed4ea1bad4708d969b093182081 /Library/Homebrew | |
| parent | b20c35cf0e16be41b59c92666c7a529f09238f1f (diff) | |
| download | brew-c227792bc16c930d637ef3a255b1848cf8eb9aa6.tar.bz2 | |
Don't raise when expanding ORIGINAL_PATHS
File.expand_path raises ArgumentError when it is passed a path with a
nonexistent username, e.g.:
$ PATH=~foo/bin:$PATH brew
/usr/local/Library/Homebrew/global.rb:97:in `expand_path': user foo
doesn't exist (ArgumentError)
However, `brew doctor` does its own expansion of PATH entries and
outputs warnings if this happens, so let's just ignore it here and
continue on our way.
Signed-off-by: Jack Nagel <jacknagel@gmail.com>
Diffstat (limited to 'Library/Homebrew')
| -rw-r--r-- | Library/Homebrew/global.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Library/Homebrew/global.rb b/Library/Homebrew/global.rb index d321f1c25..6075f0cd2 100644 --- a/Library/Homebrew/global.rb +++ b/Library/Homebrew/global.rb @@ -94,4 +94,4 @@ unless ARGV.include? "--no-compat" or ENV['HOMEBREW_NO_COMPAT'] require 'compatibility' end -ORIGINAL_PATHS = ENV['PATH'].split(':').map{ |p| Pathname.new(File.expand_path(p)) } +ORIGINAL_PATHS = ENV['PATH'].split(':').map{ |p| Pathname.new(File.expand_path(p)) rescue nil }.compact.freeze |