From b4f8671849e7bdac249c0d220cf25d054b956eaa Mon Sep 17 00:00:00 2001 From: Bo Anderson Date: Wed, 6 Nov 2019 17:24:56 +0000 Subject: [PATCH] formula_installer: copy hidden files into bottles. --- Library/Homebrew/formula_installer.rb | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Library/Homebrew/formula_installer.rb b/Library/Homebrew/formula_installer.rb index 93468b1202..a739928af7 100644 --- a/Library/Homebrew/formula_installer.rb +++ b/Library/Homebrew/formula_installer.rb @@ -18,6 +18,7 @@ require "linkage_checker" require "install" require "messages" require "cask/cask_loader" +require "find" class FormulaInstaller include FormulaCellarChecks @@ -201,12 +202,12 @@ class FormulaInstaller end def build_bottle_preinstall - @etc_var_glob ||= "#{HOMEBREW_PREFIX}/{etc,var}/**/*" - @etc_var_preinstall = Dir[@etc_var_glob] + @etc_var_dirs ||= [HOMEBREW_PREFIX/"etc", HOMEBREW_PREFIX/"var"] + @etc_var_preinstall = Find.find(*@etc_var_dirs.select(&:directory?)).to_a end def build_bottle_postinstall - @etc_var_postinstall = Dir[@etc_var_glob] + @etc_var_postinstall = Find.find(*@etc_var_dirs.select(&:directory?)).to_a (@etc_var_postinstall - @etc_var_preinstall).each do |file| Pathname.new(file).cp_path_sub(HOMEBREW_PREFIX, formula.bottle_prefix) end