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

doctor: mess with indentation

Browse Source
This commit is contained in:
Adam Vandenberg 2013-03-13 09:45:55 -07:00
parent f23cfa884c
commit 7b7268c065
1 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -38,23 +38,21 @@ end
class Checks class Checks
# Sorry for the lack of an indent here, the diff would have been unreadable.
############# HELPERS ############# HELPERS
def remove_trailing_slash s def remove_trailing_slash s
(s[s.length-1] == '/') ? s[0,s.length-1] : s (s[s.length-1] == '/') ? s[0,s.length-1] : s
end end
def paths
def paths @paths ||= ENV['PATH'].split(':').collect do |p|
@paths ||= ENV['PATH'].split(':').collect do |p| begin
begin remove_trailing_slash(File.expand_path(p))
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 end.uniq.compact
end.uniq.compact end
end
# Finds files in HOMEBREW_PREFIX *and* /usr/local. # Finds files in HOMEBREW_PREFIX *and* /usr/local.
# Specify paths relative to a prefix eg. "include/foo.h". # Specify paths relative to a prefix eg. "include/foo.h".
@ -70,6 +68,7 @@ end
end end
############# END HELPERS ############# END HELPERS
# Sorry for the lack of an indent here, the diff would have been unreadable.
# See https://github.com/mxcl/homebrew/pull/9986 # See https://github.com/mxcl/homebrew/pull/9986
def check_path_for_trailing_slashes def check_path_for_trailing_slashes
bad_paths = ENV['PATH'].split(':').select{|p| p[p.length-1, p.length] == '/'} bad_paths = ENV['PATH'].split(':').select{|p| p[p.length-1, p.length] == '/'}