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

More .DS_Store ignoring

Browse Source 
* Don't link .DS_Store files
* Don't list .DS_Store files in `brew info`

Signed-off-by: Adam Vandenberg <flangy@gmail.com>
This commit is contained in:
Michael Dippery 2010-09-02 11:47:18 -04:00 committed by Adam Vandenberg
parent 2712dd6bcc
commit e0c23d670d
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Library/Homebrew/brew.h.rb
View File

@ -198,6 +198,7 @@ def info f
if f.prefix.parent.directory? if f.prefix.parent.directory?
kids=f.prefix.parent.children kids=f.prefix.parent.children
kids.each do |keg| kids.each do |keg|
next if keg.basename.to_s == '.DS_Store'
print "#{keg} (#{keg.abv})" print "#{keg} (#{keg.abv})"
print " *" if f.installed_prefix == keg and kids.length > 1 print " *" if f.installed_prefix == keg and kids.length > 1
puts puts

2
Library/Homebrew/extend/pathname.rb
View File

@ -92,7 +92,7 @@ class Pathname
def abv def abv
out='' out=''
n=`find #{to_s} -type f | wc -l`.to_i n=`find #{to_s} -type f ! -name .DS_Store | wc -l`.to_i
out<<"#{n} files, " if n > 1 out<<"#{n} files, " if n > 1
out<<`/usr/bin/du -hd0 #{to_s} | cut -d"\t" -f1`.strip out<<`/usr/bin/du -hd0 #{to_s} | cut -d"\t" -f1`.strip
end end

2
Library/Homebrew/keg.rb
View File

@ -98,7 +98,7 @@ protected
dst.extend ObserverPathnameExtension dst.extend ObserverPathnameExtension
if src.file? if src.file?
dst.make_relative_symlink src dst.make_relative_symlink src unless File.basename(src) == '.DS_Store'
elsif src.directory? elsif src.directory?
# if the dst dir already exists, then great! walk the rest of the tree tho # if the dst dir already exists, then great! walk the rest of the tree tho
next if dst.directory? and not dst.symlink? next if dst.directory? and not dst.symlink?