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

Merge pull request #19601 from Homebrew/brew_bundle_improve_env_output

Browse Source 
`brew bundle env`: sort and filter output.
This commit is contained in:
Mike McQuaid 2025-03-25 14:03:47 +00:00 committed by GitHub
commit 8a3e6c60e3
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Library/Homebrew/bundle/commands/exec.rb
View File

@ -51,6 +51,10 @@ module Homebrew
# Cleanup Homebrew's global environment # Cleanup Homebrew's global environment
HOMEBREW_ENV_CLEANUP.each { |key| ENV.delete(key) } HOMEBREW_ENV_CLEANUP.each { |key| ENV.delete(key) }
# Store the old environment so we can check if things were already set
# before we start mutating it.
old_env = ENV.to_h
# Setup Homebrew's ENV extensions # Setup Homebrew's ENV extensions
ENV.activate_extensions! ENV.activate_extensions!
raise UsageError, "No command to execute was specified!" if args.blank? raise UsageError, "No command to execute was specified!" if args.blank?
@ -141,7 +145,13 @@ module Homebrew
raise "command was not found in your PATH: #{command}" if command.exclude?("/") && which(command).nil? raise "command was not found in your PATH: #{command}" if command.exclude?("/") && which(command).nil?
if subcommand == "env" if subcommand == "env"
ENV.each do |key, value| ENV.sort.each do |key, value|
# No need to export empty values.
next if value.blank?
# Skip exporting non-Homebrew things that were already set in the old environment.
next if !key.start_with?("HOMEBREW_") && old_env.key?(key) && old_env[key] == value
puts "export #{key}=\"#{Utils::Shell.sh_quote(value)}\"" puts "export #{key}=\"#{Utils::Shell.sh_quote(value)}\""
end end
return return