diff options
| author | Jack Nagel | 2014-06-07 17:52:11 -0500 |
|---|---|---|
| committer | Jack Nagel | 2014-06-07 21:15:56 -0500 |
| commit | f6073a1d409f0cb1851a0c5e6968575d5feb1260 (patch) | |
| tree | 9cad9e5089666f9aefd26275562b670ba3e1cf49 /Library/Homebrew/extend | |
| parent | 376b0556da574ffc3fb3ad00aa1d892801ed5ad0 (diff) | |
| download | homebrew-f6073a1d409f0cb1851a0c5e6968575d5feb1260.tar.bz2 | |
Simplify Pathname#install_metafiles
Diffstat (limited to 'Library/Homebrew/extend')
| -rw-r--r-- | Library/Homebrew/extend/pathname.rb | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/Library/Homebrew/extend/pathname.rb b/Library/Homebrew/extend/pathname.rb index 91dd6d5a1..f04c6a810 100644 --- a/Library/Homebrew/extend/pathname.rb +++ b/Library/Homebrew/extend/pathname.rb @@ -375,12 +375,8 @@ class Pathname EOS end - def install_metafiles from=nil - # Default to current path, and make sure we have a pathname, not a string - from = "." if from.nil? - from = Pathname.new(from.to_s) - - from.children.each do |p| + def install_metafiles from=Pathname.pwd + Pathname(from).children.each do |p| next if p.directory? next unless Metafiles.copy?(p) # Some software symlinks these files (see help2man.rb) @@ -389,7 +385,7 @@ class Pathname # we may have already moved it. libxml2's COPYING and Copyright are affected by this. next unless filename.exist? filename.chmod 0644 - self.install filename + install(filename) end end |
