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

constantify @etc_var_dirs

Browse Source
This commit is contained in:
Douglas Eichelberger 2024-09-09 08:22:43 -07:00
parent 0d44b110f9
commit ef33b35262
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Library/Homebrew/formula_installer.rb
View File

@ -31,6 +31,8 @@ class FormulaInstaller
include FormulaCellarChecks include FormulaCellarChecks
extend Attrable extend Attrable
ETC_VAR_DIRS = T.let([HOMEBREW_PREFIX/"etc", HOMEBREW_PREFIX/"var"].freeze, T::Array[Pathname])
sig { override.returns(Formula) } sig { override.returns(Formula) }
attr_reader :formula attr_reader :formula
@ -118,7 +120,6 @@ class FormulaInstaller
@bottle_tab_runtime_dependencies = T.let({}.freeze, T::Hash[String, T::Hash[String, String]]) @bottle_tab_runtime_dependencies = T.let({}.freeze, T::Hash[String, T::Hash[String, String]])
@hold_locks = T.let(false, T::Boolean) @hold_locks = T.let(false, T::Boolean)
@show_summary_heading = T.let(false, T::Boolean) @show_summary_heading = T.let(false, T::Boolean)
@etc_var_dirs = T.let([], T::Array[Pathname])
@etc_var_preinstall = T.let([], T::Array[Pathname]) @etc_var_preinstall = T.let([], T::Array[Pathname])
@etc_var_postinstall = T.let([], T::Array[Pathname]) @etc_var_postinstall = T.let([], T::Array[Pathname])
@ -379,9 +380,7 @@ class FormulaInstaller
end end
sig { params(_formula: Formula).returns(T.nilable(T::Boolean)) } sig { params(_formula: Formula).returns(T.nilable(T::Boolean)) }
def fresh_install?(_formula) def fresh_install?(_formula) = false
false
end
sig { void } sig { void }
def install_fetch_deps def install_fetch_deps
@ -398,13 +397,12 @@ class FormulaInstaller
sig { void } sig { void }
def build_bottle_preinstall def build_bottle_preinstall
@etc_var_dirs = [HOMEBREW_PREFIX/"etc", HOMEBREW_PREFIX/"var"] @etc_var_preinstall = Find.find(*ETC_VAR_DIRS.select(&:directory?)).to_a
@etc_var_preinstall = Find.find(*@etc_var_dirs.select(&:directory?)).to_a
end end
sig { void } sig { void }
def build_bottle_postinstall def build_bottle_postinstall
@etc_var_postinstall = Find.find(*@etc_var_dirs.select(&:directory?)).to_a @etc_var_postinstall = Find.find(*ETC_VAR_DIRS.select(&:directory?)).to_a
(@etc_var_postinstall - @etc_var_preinstall).each do |file| (@etc_var_postinstall - @etc_var_preinstall).each do |file|
Pathname.new(file).cp_path_sub(HOMEBREW_PREFIX, formula.bottle_prefix) Pathname.new(file).cp_path_sub(HOMEBREW_PREFIX, formula.bottle_prefix)
end end
@ -954,9 +952,7 @@ on_request: installed_on_request?, options:)
end end
sig { returns(T::Array[String]) } sig { returns(T::Array[String]) }
def build_argv def build_argv = sanitized_argv_options + options.as_flags
sanitized_argv_options + options.as_flags
end
sig { void } sig { void }
def build def build