From 9e0cbe0fd7e9cd52fbd2296d92f77fd973522154 Mon Sep 17 00:00:00 2001 From: Mike McQuaid Date: Fri, 14 Jun 2024 12:06:06 +0100 Subject: [PATCH] Rename variable to HOMEBREW_USING_PORTABLE_RUBY --- Library/Homebrew/standalone/init.rb | 4 ++-- Library/Homebrew/startup/bootsnap.rb | 2 +- Library/Homebrew/utils/gems.rb | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Library/Homebrew/standalone/init.rb b/Library/Homebrew/standalone/init.rb index dc2ad59894..a24ce6ef52 100644 --- a/Library/Homebrew/standalone/init.rb +++ b/Library/Homebrew/standalone/init.rb @@ -29,7 +29,7 @@ $LOAD_PATH.reject! { |path| path.start_with?(RbConfig::CONFIG["sitedir"]) } require "pathname" dir = __dir__ || raise("__dir__ is not defined") HOMEBREW_LIBRARY_PATH = Pathname(dir).parent.realpath.freeze -HOMEBREW_PORTABLE_RUBY = Pathname.new(RbConfig.ruby).to_s.include?("/vendor/portable-ruby/").freeze +HOMEBREW_USING_PORTABLE_RUBY = Pathname.new(RbConfig.ruby).to_s.include?("/vendor/portable-ruby/").freeze require_relative "../utils/gems" Homebrew.setup_gem_environment!(setup_path: false) @@ -48,7 +48,7 @@ unless $LOAD_PATH.include?(HOMEBREW_LIBRARY_PATH.to_s) $LOAD_PATH.insert(last_homebrew_path_idx + 1, HOMEBREW_LIBRARY_PATH.to_s) end require_relative "../vendor/bundle/bundler/setup" -require "portable_ruby_gems" if HOMEBREW_PORTABLE_RUBY +require "portable_ruby_gems" if HOMEBREW_USING_PORTABLE_RUBY $LOAD_PATH.unshift "#{HOMEBREW_LIBRARY_PATH}/vendor/bundle/#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/" \ "bundler-#{Homebrew::HOMEBREW_BUNDLER_VERSION}/lib" $LOAD_PATH.uniq! diff --git a/Library/Homebrew/startup/bootsnap.rb b/Library/Homebrew/startup/bootsnap.rb index 19511b71e5..29bdd6983e 100644 --- a/Library/Homebrew/startup/bootsnap.rb +++ b/Library/Homebrew/startup/bootsnap.rb @@ -14,7 +14,7 @@ if homebrew_bootsnap_enabled begin require "bootsnap" rescue LoadError - raise if ENV["HOMEBREW_BOOTSNAP_RETRY"] || HOMEBREW_PORTABLE_RUBY + raise if ENV["HOMEBREW_BOOTSNAP_RETRY"] || HOMEBREW_USING_PORTABLE_RUBY Homebrew.install_bundler_gems!(groups: ["bootsnap"], only_warn_on_failure: true) diff --git a/Library/Homebrew/utils/gems.rb b/Library/Homebrew/utils/gems.rb index db35ff5d61..dc60f5b847 100644 --- a/Library/Homebrew/utils/gems.rb +++ b/Library/Homebrew/utils/gems.rb @@ -241,7 +241,7 @@ module Homebrew # Combine the passed groups with the ones stored in settings. groups |= (user_gem_groups & valid_gem_groups) - groups.delete("bootsnap") if HOMEBREW_PORTABLE_RUBY + groups.delete("bootsnap") if HOMEBREW_USING_PORTABLE_RUBY groups.sort! if (homebrew_bundle_user_cache = ENV.fetch("HOMEBREW_BUNDLE_USER_CACHE", nil))