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

Merge pull request #20514 from Homebrew/diagnostic-fixes

Browse Source 
diagnostic: miscellaneous fixes
This commit is contained in:
Mike McQuaid 2025-08-19 11:36:32 +00:00 committed by GitHub
commit 74efe54605
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Library/Homebrew/diagnostic.rb
View File

@ -84,7 +84,12 @@ module Homebrew
sig { params(path: String).returns(String) } sig { params(path: String).returns(String) }
def user_tilde(path) def user_tilde(path)
path.gsub(Dir.home, "~") home = Dir.home
if path == home
"~"
else
path.gsub(%r{^#{home}/}, "~/")
end
end end
sig { returns(T.nilable(String)) } sig { returns(T.nilable(String)) }
@ -1068,11 +1073,10 @@ module Homebrew
locale_variables = ENV.keys.grep(/^(?:LC_\S+|LANG|LANGUAGE)\Z/).sort locale_variables = ENV.keys.grep(/^(?:LC_\S+|LANG|LANGUAGE)\Z/).sort
cask_environment_variables = (locale_variables + environment_variables).sort.each do |var| cask_environment_variables = (locale_variables + environment_variables).sort.filter_map do |var|
next unless ENV.key?(var) next unless ENV.key?(var)
var = %Q(#{var}="#{ENV.fetch(var)}") %Q(#{var}="#{Utils::Shell.sh_quote(ENV.fetch(var))}")
user_tilde(var)
end end
add_info "Cask Environment Variables:", cask_environment_variables add_info "Cask Environment Variables:", cask_environment_variables