From e739a5c076de16e457da8215f5d01b86bb19e679 Mon Sep 17 00:00:00 2001 From: Issy Long Date: Sun, 30 Apr 2023 19:06:07 +0100 Subject: [PATCH] "A few small nits" from code review Co-authored-by: Mike McQuaid --- Library/Homebrew/diagnostic.rb | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/Library/Homebrew/diagnostic.rb b/Library/Homebrew/diagnostic.rb index 9c18de3b1c..f756ab3ea4 100644 --- a/Library/Homebrew/diagnostic.rb +++ b/Library/Homebrew/diagnostic.rb @@ -843,8 +843,9 @@ module Homebrew end def check_for_unnecessary_core_tap - return if ENV["HOMEBREW_DEVELOPER"] - return if ENV["HOMEBREW_NO_INSTALL_FROM_API"] + return if Homebrew::EnvConfig.developer? + return if Homebrew::EnvConfig.no_install_from_api? + return if Homebrew::Settings.read("devcmdrun") == "true" return unless CoreTap.instance.installed? <<~EOS @@ -856,9 +857,11 @@ module Homebrew end def check_for_unnecessary_cask_tap - return if ENV["HOMEBREW_DEVELOPER"] - return if ENV["HOMEBREW_NO_INSTALL_FROM_API"] - return unless (cask_tap = Tap.fetch("homebrew", "cask")).installed? + return if Homebrew::EnvConfig.developer? + return if Homebrew::EnvConfig.no_install_from_api? + return if Homebrew::Settings.read("devcmdrun") == "true" + cask_tap = Tap.fetch("homebrew", "cask") + return unless cask_tap.installed? <<~EOS You have an unnecessary local Cask tap.