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

doctor: simplify trailing slash checks

Browse Source
This commit is contained in:
Jack Nagel 2013-05-23 23:07:20 -05:00
parent 6a020239d1
commit 187b9c9d59
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -41,14 +41,10 @@ end
class Checks class Checks
############# HELPERS ############# HELPERS
def remove_trailing_slash s
(s[s.length-1] == '/') ? s[0,s.length-1] : s
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)) File.expand_path(p).chomp('/')
rescue ArgumentError rescue ArgumentError
onoe "The following PATH component is invalid: #{p}" onoe "The following PATH component is invalid: #{p}"
end end
@ -72,7 +68,7 @@ class Checks
# Sorry for the lack of an indent here, the diff would have been unreadable. # 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[-1..-1] == '/' }
return if bad_paths.empty? return if bad_paths.empty?
s = <<-EOS.undent s = <<-EOS.undent
Some directories in your path end in a slash. Some directories in your path end in a slash.