From 0118e6ec41a4fb2e2638165fee0a4f492f19bf81 Mon Sep 17 00:00:00 2001 From: Mike McQuaid Date: Thu, 21 Oct 2021 15:10:17 +0100 Subject: [PATCH] Apply suggestions from code review Co-authored-by: Xuehai Pan --- Library/Homebrew/cmd/update-report.rb | 8 +++++--- Library/Homebrew/extend/os/linux/diagnostic.rb | 8 ++++---- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/Library/Homebrew/cmd/update-report.rb b/Library/Homebrew/cmd/update-report.rb index 4d3360976d..7c0df7ad20 100644 --- a/Library/Homebrew/cmd/update-report.rb +++ b/Library/Homebrew/cmd/update-report.rb @@ -48,7 +48,8 @@ module Homebrew if ENV["HOMEBREW_CORE_DEFAULT_GIT_REMOTE"] != ENV["HOMEBREW_CORE_GIT_REMOTE"] opoo <<~EOS - HOMEBREW_CORE_GIT_REMOTE was set. It has been unset for the migration. + HOMEBREW_CORE_GIT_REMOTE was set: #{ENV["HOMEBREW_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. EOS @@ -57,8 +58,9 @@ module Homebrew if ENV["HOMEBREW_BOTTLE_DEFAULT_DOMAIN"] != ENV["HOMEBREW_BOTTLE_DOMAIN"] opoo <<~EOS - HOMEBREW_BOTTLE_DOMAIN was set. It has been unset for the migration. - You may need to change this Linuxbrew packages to Homebrew packages. + HOMEBREW_BOTTLE_DOMAIN was set: #{ENV["HOMEBREW_BOTTLE_DOMAIN"]}. + It has been unset for the migration. + You may need to change this from a Linuxbrew package mirror to a Homebrew one. EOS end diff --git a/Library/Homebrew/extend/os/linux/diagnostic.rb b/Library/Homebrew/extend/os/linux/diagnostic.rb index f9c6afe650..b85cf756f4 100644 --- a/Library/Homebrew/extend/os/linux/diagnostic.rb +++ b/Library/Homebrew/extend/os/linux/diagnostic.rb @@ -130,12 +130,12 @@ module Homebrew end def check_linuxbrew_bottle_domain - return unless Homebrew::EnvConfig.bottle_domain.include?("linuxbrew-core") + return unless Homebrew::EnvConfig.bottle_domain.include?("linuxbrew") <<~EOS - Your HOMEBREW_BOTTLE_DOMAIN still contains linuxbrew-core. - You must unset it (or adjust it to not contain linuxbrew-core - e.g. by using homebrew-core instead). + Your HOMEBREW_BOTTLE_DOMAIN still contains "linuxbrew". + You must unset it (or adjust it to not contain linuxbrew + e.g. by using homebrew instead). EOS end end