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

doctor: rename path_folders to paths

Browse Source
This commit is contained in:
Jack Nagel 2012-12-21 17:16:24 -06:00
parent 1780855023
commit 847547167a
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Library/Homebrew/cmd/doctor.rb
View File

@ -46,9 +46,10 @@ def remove_trailing_slash s
end end
def path_folders def paths
@path_folders ||= ENV['PATH'].split(':').collect do |p| @paths ||= ENV['PATH'].split(':').collect do |p|
begin remove_trailing_slash(File.expand_path(p)) begin
remove_trailing_slash(File.expand_path(p))
rescue ArgumentError rescue ArgumentError
onoe "The following PATH component is invalid: #{p}" onoe "The following PATH component is invalid: #{p}"
end end
@ -439,7 +440,8 @@ def check_user_path_1
out = nil out = nil
path_folders.each do |p| case p paths.each do |p|
case p
when '/usr/bin' when '/usr/bin'
seen_usr_bin = true seen_usr_bin = true
unless $seen_prefix_bin 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 = %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 } whitelist.map! { |d| d.downcase }
path_folders.each do |p| paths.each do |p|
next if whitelist.include? p.downcase next if whitelist.include? p.downcase
next if p =~ %r[^(#{real_cellar.to_s}|#{HOMEBREW_CELLAR.to_s})] if real_cellar next if p =~ %r[^(#{real_cellar.to_s}|#{HOMEBREW_CELLAR.to_s})] if real_cellar