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

Improve HOMEBREW_TEMP handling

Browse Source 
- if HOMEBREW_TEMP is not writable, use the default temp directory
- when running `brew bundle exec`, strip various temporary directories
  from the environment if they are not writable
This commit is contained in:
Mike McQuaid 2025-04-14 19:10:58 +01:00
parent f9fe0f573b
commit dbbffbaca5
No known key found for this signature in database
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Library/Homebrew/brew.sh
View File

@ -104,6 +104,10 @@ HOMEBREW_CASKROOM="${HOMEBREW_PREFIX}/Caskroom"
HOMEBREW_CACHE="${HOMEBREW_CACHE:-${HOMEBREW_DEFAULT_CACHE}}" HOMEBREW_CACHE="${HOMEBREW_CACHE:-${HOMEBREW_DEFAULT_CACHE}}"
HOMEBREW_LOGS="${HOMEBREW_LOGS:-${HOMEBREW_DEFAULT_LOGS}}" HOMEBREW_LOGS="${HOMEBREW_LOGS:-${HOMEBREW_DEFAULT_LOGS}}"
HOMEBREW_TEMP="${HOMEBREW_TEMP:-${HOMEBREW_DEFAULT_TEMP}}" HOMEBREW_TEMP="${HOMEBREW_TEMP:-${HOMEBREW_DEFAULT_TEMP}}"
if [[ ! -w "${HOMEBREW_TEMP}" ]]
then
HOMEBREW_TEMP="${HOMEBREW_DEFAULT_TEMP}"
fi
# commands that take a single or no arguments. # commands that take a single or no arguments.
# HOMEBREW_LIBRARY set by bin/brew # HOMEBREW_LIBRARY set by bin/brew

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

@ -111,6 +111,14 @@ module Homebrew
# For commands which aren't either absolute or relative # For commands which aren't either absolute or relative
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?
%w[HOMEBREW_TEMP TMPDIR HOMEBREW_TMPDIR].each do |var|
value = ENV.fetch(var, nil)
next if value.blank?
next if File.writable?(value)
ENV.delete(var)
end
if subcommand == "env" if subcommand == "env"
ENV.sort.each do |key, value| ENV.sort.each do |key, value|
# No need to export empty values. # No need to export empty values.