utils/gems: use BUNDLE_USER_CACHE instead of BUNDLE_CACHE_PATH.

Take two at https://github.com/Homebrew/brew/pull/17304 with the correct
variable name this time.

Fixes #17276.
This commit is contained in:
Mike McQuaid 2024-05-17 23:00:12 +09:00
parent 79cb329f59
commit 1eb99cdb0e
No known key found for this signature in database

View File

@ -224,7 +224,7 @@ module Homebrew
old_path = ENV.fetch("PATH", nil) old_path = ENV.fetch("PATH", nil)
old_gem_path = ENV.fetch("GEM_PATH", nil) old_gem_path = ENV.fetch("GEM_PATH", nil)
old_gem_home = ENV.fetch("GEM_HOME", nil) old_gem_home = ENV.fetch("GEM_HOME", nil)
old_bundle_cache_path = ENV.fetch("BUNDLE_CACHE_PATH", nil) old_bundle_user_cache = ENV.fetch("BUNDLE_USER_CACHE", nil)
old_bundle_gemfile = ENV.fetch("BUNDLE_GEMFILE", nil) old_bundle_gemfile = ENV.fetch("BUNDLE_GEMFILE", nil)
old_bundle_with = ENV.fetch("BUNDLE_WITH", nil) old_bundle_with = ENV.fetch("BUNDLE_WITH", nil)
old_bundle_frozen = ENV.fetch("BUNDLE_FROZEN", nil) old_bundle_frozen = ENV.fetch("BUNDLE_FROZEN", nil)
@ -249,7 +249,7 @@ module Homebrew
else else
ENV.fetch("HOMEBREW_CACHE") ENV.fetch("HOMEBREW_CACHE")
end end
ENV["BUNDLE_CACHE_PATH"] = "#{homebrew_cache}/bundler_cache" ENV["BUNDLE_USER_CACHE"] = "#{homebrew_cache}/bundler_cache"
ENV["BUNDLE_GEMFILE"] = gemfile ENV["BUNDLE_GEMFILE"] = gemfile
ENV["BUNDLE_WITH"] = groups.join(" ") ENV["BUNDLE_WITH"] = groups.join(" ")
ENV["BUNDLE_FROZEN"] = "true" ENV["BUNDLE_FROZEN"] = "true"
@ -346,7 +346,7 @@ module Homebrew
ENV["BUNDLE_GEMFILE"] = old_bundle_gemfile ENV["BUNDLE_GEMFILE"] = old_bundle_gemfile
ENV["BUNDLE_WITH"] = old_bundle_with ENV["BUNDLE_WITH"] = old_bundle_with
ENV["BUNDLE_FROZEN"] = old_bundle_frozen ENV["BUNDLE_FROZEN"] = old_bundle_frozen
ENV["BUNDLE_CACHE_PATH"] = old_bundle_cache_path ENV["BUNDLE_USER_CACHE"] = old_bundle_user_cache
end end
end end
end end