From 847547167a02e9c0c5548ab13f4b5c9470440339 Mon Sep 17 00:00:00 2001
From: Jack Nagel <jacknagel@gmail.com>
Date: Fri, 21 Dec 2012 17:16:24 -0600
Subject: [PATCH] doctor: rename path_folders to paths
---
Library/Homebrew/cmd/doctor.rb | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/Library/Homebrew/cmd/doctor.rb b/Library/Homebrew/cmd/doctor.rb
index 5947005c7a..b0327b79e7 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
--
GitLab