From 07257f2f4861449f3446a06d5eed2b36f4deda65 Mon Sep 17 00:00:00 2001 From: Jack Nagel Date: Sat, 7 Jun 2014 17:52:11 -0500 Subject: [PATCH] Simplify Pathname#install_metafiles --- Library/Homebrew/extend/pathname.rb | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/Library/Homebrew/extend/pathname.rb b/Library/Homebrew/extend/pathname.rb index 91dd6d5a1d..f04c6a8100 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