Skip to content

Commit

Permalink
Merge pull request #17324 from Homebrew/bundle_user_cache
Browse files Browse the repository at this point in the history
utils/gems: use BUNDLE_USER_CACHE instead of BUNDLE_CACHE_PATH.
  • Loading branch information
MikeMcQuaid authored May 17, 2024
2 parents 79cb329 + 1eb99cd commit a8f603d
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions Library/Homebrew/utils/gems.rb
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,7 @@ def install_bundler_gems!(only_warn_on_failure: false, setup_path: true, groups:
old_path = ENV.fetch("PATH", nil)
old_gem_path = ENV.fetch("GEM_PATH", 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_with = ENV.fetch("BUNDLE_WITH", nil)
old_bundle_frozen = ENV.fetch("BUNDLE_FROZEN", nil)
Expand All @@ -249,7 +249,7 @@ def install_bundler_gems!(only_warn_on_failure: false, setup_path: true, groups:
else
ENV.fetch("HOMEBREW_CACHE")
end
ENV["BUNDLE_CACHE_PATH"] = "#{homebrew_cache}/bundler_cache"
ENV["BUNDLE_USER_CACHE"] = "#{homebrew_cache}/bundler_cache"
ENV["BUNDLE_GEMFILE"] = gemfile
ENV["BUNDLE_WITH"] = groups.join(" ")
ENV["BUNDLE_FROZEN"] = "true"
Expand Down Expand Up @@ -346,7 +346,7 @@ def install_bundler_gems!(only_warn_on_failure: false, setup_path: true, groups:
ENV["BUNDLE_GEMFILE"] = old_bundle_gemfile
ENV["BUNDLE_WITH"] = old_bundle_with
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

0 comments on commit a8f603d

Please sign in to comment.