diff options
| author | Jack Nagel | 2012-12-21 17:16:24 -0600 |
|---|---|---|
| committer | Jack Nagel | 2012-12-21 17:16:57 -0600 |
| commit | c1c0abd080d0bacabd8faf351e5e9f3ddeff6da1 (patch) | |
| tree | f830413e06a727d178d5bbd550574d82d9a90488 /Library/Homebrew/cmd | |
| parent | d0ab4d9eae7330906e8f576d8655a62db64c4a7d (diff) | |
| download | homebrew-c1c0abd080d0bacabd8faf351e5e9f3ddeff6da1.tar.bz2 | |
doctor: rename path_folders to paths
Diffstat (limited to 'Library/Homebrew/cmd')
| -rw-r--r-- | Library/Homebrew/cmd/doctor.rb | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/Library/Homebrew/cmd/doctor.rb b/Library/Homebrew/cmd/doctor.rb index 5947005c7..b0327b79e 100644 --- a/Library/Homebrew/cmd/doctor.rb +++ b/Library/Homebrew/cmd/doctor.rb @@ -46,9 +46,10 @@ def remove_trailing_slash s end -def path_folders - @path_folders ||= ENV['PATH'].split(':').collect do |p| - begin remove_trailing_slash(File.expand_path(p)) +def paths + @paths ||= ENV['PATH'].split(':').collect do |p| + begin + remove_trailing_slash(File.expand_path(p)) rescue ArgumentError onoe "The following PATH component is invalid: #{p}" end @@ -439,7 +440,8 @@ def check_user_path_1 out = nil - path_folders.each do |p| case p + paths.each do |p| + case p when '/usr/bin' seen_usr_bin = true unless $seen_prefix_bin @@ -582,7 +584,7 @@ def check_for_config_scripts whitelist = %W[/usr/bin /usr/sbin /usr/X11/bin /usr/X11R6/bin /opt/X11/bin #{HOMEBREW_PREFIX}/bin #{HOMEBREW_PREFIX}/sbin] whitelist.map! { |d| d.downcase } - path_folders.each do |p| + paths.each do |p| next if whitelist.include? p.downcase next if p =~ %r[^(#{real_cellar.to_s}|#{HOMEBREW_CELLAR.to_s})] if real_cellar |