From 06752f032f3abd89d3052edb12cf44fa7da5c2f5 Mon Sep 17 00:00:00 2001 From: Mike McQuaid Date: Tue, 9 Jan 2024 10:13:33 +0000 Subject: [PATCH] cmd/*env-sync: use *ENV_ROOT Fixes https://github.com/Homebrew/brew/issues/16428 --- Library/Homebrew/cmd/nodenv-sync.rb | 6 +++--- Library/Homebrew/cmd/pyenv-sync.rb | 6 +++--- Library/Homebrew/cmd/rbenv-sync.rb | 6 +++--- bin/brew | 3 +++ 4 files changed, 12 insertions(+), 9 deletions(-) diff --git a/Library/Homebrew/cmd/nodenv-sync.rb b/Library/Homebrew/cmd/nodenv-sync.rb index 8def8e6723..d999462072 100755 --- a/Library/Homebrew/cmd/nodenv-sync.rb +++ b/Library/Homebrew/cmd/nodenv-sync.rb @@ -23,14 +23,14 @@ module Homebrew sig { void } def nodenv_sync - dot_nodenv = Pathname(Dir.home)/".nodenv" + nodenv_root = Pathname(ENV.fetch("HOMEBREW_NODENV_ROOT", Pathname(Dir.home)/".nodenv")) # Don't run multiple times at once. - nodenv_sync_running = dot_nodenv/".nodenv_sync_running" + nodenv_sync_running = nodenv_root/".nodenv_sync_running" return if nodenv_sync_running.exist? begin - nodenv_versions = dot_nodenv/"versions" + nodenv_versions = nodenv_root/"versions" nodenv_versions.mkpath FileUtils.touch nodenv_sync_running diff --git a/Library/Homebrew/cmd/pyenv-sync.rb b/Library/Homebrew/cmd/pyenv-sync.rb index b98d07a26a..c2837ef436 100644 --- a/Library/Homebrew/cmd/pyenv-sync.rb +++ b/Library/Homebrew/cmd/pyenv-sync.rb @@ -23,14 +23,14 @@ module Homebrew sig { void } def pyenv_sync - dot_pyenv = Pathname(Dir.home)/".pyenv" + pyenv_root = Pathname(ENV.fetch("HOMEBREW_PYENV_ROOT", Pathname(Dir.home)/".pyenv")) # Don't run multiple times at once. - pyenv_sync_running = dot_pyenv/".pyenv_sync_running" + pyenv_sync_running = pyenv_root/".pyenv_sync_running" return if pyenv_sync_running.exist? begin - pyenv_versions = dot_pyenv/"versions" + pyenv_versions = pyenv_root/"versions" pyenv_versions.mkpath FileUtils.touch pyenv_sync_running diff --git a/Library/Homebrew/cmd/rbenv-sync.rb b/Library/Homebrew/cmd/rbenv-sync.rb index 5deef1e036..f133a145be 100755 --- a/Library/Homebrew/cmd/rbenv-sync.rb +++ b/Library/Homebrew/cmd/rbenv-sync.rb @@ -23,14 +23,14 @@ module Homebrew sig { void } def rbenv_sync - dot_rbenv = Pathname(Dir.home)/".rbenv" + rbenv_root = Pathname(ENV.fetch("HOMEBREW_RBENV_ROOT", Pathname(Dir.home)/".rbenv")) # Don't run multiple times at once. - rbenv_sync_running = dot_rbenv/".rbenv_sync_running" + rbenv_sync_running = rbenv_root/".rbenv_sync_running" return if rbenv_sync_running.exist? begin - rbenv_versions = dot_rbenv/"versions" + rbenv_versions = rbenv_root/"versions" rbenv_versions.mkpath FileUtils.touch rbenv_sync_running diff --git a/bin/brew b/bin/brew index 34b2e5b3ea..635926240c 100755 --- a/bin/brew +++ b/bin/brew @@ -154,7 +154,10 @@ USED_BY_HOMEBREW_VARS=( CODESPACES COLORTERM DBUS_SESSION_BUS_ADDRESS + NODENV_ROOT PATH + PYENV_ROOT + RBENV_ROOT SSH_TTY SUDO_USER TMUX