From a2033c397e3ab0783aceac84025c9924ebed5c3f Mon Sep 17 00:00:00 2001 From: Bo Anderson Date: Mon, 30 May 2022 04:15:28 +0100 Subject: [PATCH] Use EnvConfig methods over direct ENV access --- Library/Homebrew/cmd/update-report.rb | 10 +++++----- Library/Homebrew/dev-cmd/livecheck.rb | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Library/Homebrew/cmd/update-report.rb b/Library/Homebrew/cmd/update-report.rb index 51d6b113ff..13191cd3a8 100644 --- a/Library/Homebrew/cmd/update-report.rb +++ b/Library/Homebrew/cmd/update-report.rb @@ -54,9 +54,9 @@ module Homebrew ENV["HOMEBREW_LINUXBREW_CORE_MIGRATION"].blank? ohai "Re-running `brew update` for linuxbrew-core migration" - if ENV["HOMEBREW_CORE_DEFAULT_GIT_REMOTE"] != ENV["HOMEBREW_CORE_GIT_REMOTE"] + if HOMEBREW_CORE_DEFAULT_GIT_REMOTE != Homebrew::EnvConfig.core_git_remote opoo <<~EOS - HOMEBREW_CORE_GIT_REMOTE was set: #{ENV["HOMEBREW_CORE_GIT_REMOTE"]}. + HOMEBREW_CORE_GIT_REMOTE was set: #{Homebrew::EnvConfig.core_git_remote}. It has been unset for the migration. You may need to change this from a linuxbrew-core mirror to a homebrew-core one. @@ -64,9 +64,9 @@ module Homebrew end ENV.delete("HOMEBREW_CORE_GIT_REMOTE") - if ENV["HOMEBREW_BOTTLE_DEFAULT_DOMAIN"] != ENV["HOMEBREW_BOTTLE_DOMAIN"] + if HOMEBREW_BOTTLE_DEFAULT_DOMAIN != Homebrew::EnvConfig.bottle_domain opoo <<~EOS - HOMEBREW_BOTTLE_DOMAIN was set: #{ENV["HOMEBREW_BOTTLE_DOMAIN"]}. + HOMEBREW_BOTTLE_DOMAIN was set: #{Homebrew::EnvConfig.bottle_domain}. It has been unset for the migration. You may need to change this from a Linuxbrew package mirror to a Homebrew one. @@ -142,7 +142,7 @@ module Homebrew end Homebrew.failed = true if ENV["HOMEBREW_UPDATE_FAILED"] - return if ENV["HOMEBREW_DISABLE_LOAD_FORMULA"] + return if Homebrew::EnvConfig.disable_load_formula? hub = ReporterHub.new diff --git a/Library/Homebrew/dev-cmd/livecheck.rb b/Library/Homebrew/dev-cmd/livecheck.rb index d857bd3d99..a3f8e36c87 100644 --- a/Library/Homebrew/dev-cmd/livecheck.rb +++ b/Library/Homebrew/dev-cmd/livecheck.rb @@ -12,7 +12,7 @@ module Homebrew module_function WATCHLIST_PATH = ( - ENV["HOMEBREW_LIVECHECK_WATCHLIST"] || + Homebrew::EnvConfig.livecheck_watchlist || "#{Dir.home}/.brew_livecheck_watchlist" ).freeze @@ -58,7 +58,7 @@ module Homebrew if args.debug? && args.verbose? puts args - puts ENV["HOMEBREW_LIVECHECK_WATCHLIST"] if ENV["HOMEBREW_LIVECHECK_WATCHLIST"].present? + puts Homebrew::EnvConfig.livecheck_watchlist if Homebrew::EnvConfig.livecheck_watchlist.present? end formulae_and_casks_to_check = if args.tap