From 92c9d61e4f5a6fe0d9d17596a46c77af55fc9f7b Mon Sep 17 00:00:00 2001 From: Carlo Cabrera <30379873+carlocab@users.noreply.github.com> Date: Wed, 27 Oct 2021 19:22:41 +0800 Subject: [PATCH] Skip bottle relocation for now. We need to have the pour relocation in a `brew` release tag before we can enable this. Also, add the empty line that the GitHub UI ate when I committed a suggestion. --- Library/Homebrew/keg_relocate.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Library/Homebrew/keg_relocate.rb b/Library/Homebrew/keg_relocate.rb index 03e82d8047..11296480e2 100644 --- a/Library/Homebrew/keg_relocate.rb +++ b/Library/Homebrew/keg_relocate.rb @@ -98,7 +98,8 @@ class Keg relocation.add_replacement_pair(:perl, %r{\A#!(?:/usr/bin/perl\d\.\d+|#{HOMEBREW_PREFIX}/opt/perl/bin/perl)( |$)}o, "#!#{PERL_PLACEHOLDER}\\1") - relocation.add_replacement_pair(:java, JAVA_REGEX, JAVA_PLACEHOLDER) + # TODO: Enable relocation upon bottling when relocation upon pouring is in a brew release tag. + # relocation.add_replacement_pair(:java, JAVA_REGEX, JAVA_PLACEHOLDER) relocation end alias generic_prepare_relocation_to_placeholders prepare_relocation_to_placeholders @@ -133,6 +134,7 @@ class Keg def openjdk_dep_name_if_applicable deps = runtime_dependencies return if deps.blank? + dep_names = deps.map { |d| d["full_name"] } dep_names.find { |d| d.match? Version.formula_optionally_versioned_regex(:openjdk) } end