From 457de40117188880f15a864d1ac3dd437274ea07 Mon Sep 17 00:00:00 2001 From: Carlo Cabrera <30379873+carlocab@users.noreply.github.com> Date: Wed, 27 Oct 2021 18:25:59 +0800 Subject: [PATCH] Apply suggestions from code review These are just a few style improvements. Co-authored-by: Mike McQuaid --- Library/Homebrew/extend/os/mac/keg_relocate.rb | 3 +-- Library/Homebrew/keg_relocate.rb | 13 ++++++++----- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/Library/Homebrew/extend/os/mac/keg_relocate.rb b/Library/Homebrew/extend/os/mac/keg_relocate.rb index 9ce21d5a27..6082207357 100644 --- a/Library/Homebrew/extend/os/mac/keg_relocate.rb +++ b/Library/Homebrew/extend/os/mac/keg_relocate.rb @@ -172,8 +172,7 @@ class Keg end relocation.add_replacement_pair(:perl, PERL_PLACEHOLDER, perl_path) - openjdk = openjdk_dep_name_if_applicable - if openjdk + if (openjdk = openjdk_dep_name_if_applicable) openjdk_path = HOMEBREW_PREFIX/"opt"/openjdk/"libexec/openjdk.jdk/Contents/Home" relocation.add_replacement_pair(:java, JAVA_PLACEHOLDER, openjdk_path.to_s) end diff --git a/Library/Homebrew/keg_relocate.rb b/Library/Homebrew/keg_relocate.rb index 6058996e77..af5aa6fa1c 100644 --- a/Library/Homebrew/keg_relocate.rb +++ b/Library/Homebrew/keg_relocate.rb @@ -116,8 +116,9 @@ class Keg relocation.add_replacement_pair(:repository, REPOSITORY_PLACEHOLDER, HOMEBREW_REPOSITORY.to_s) relocation.add_replacement_pair(:library, LIBRARY_PLACEHOLDER, HOMEBREW_LIBRARY.to_s) relocation.add_replacement_pair(:perl, PERL_PLACEHOLDER, "#{HOMEBREW_PREFIX}/opt/perl/bin/perl") - openjdk = openjdk_dep_name_if_applicable - relocation.add_replacement_pair(:java, JAVA_PLACEHOLDER, "#{HOMEBREW_PREFIX}/opt/#{openjdk}/libexec") if openjdk + if (openjdk = openjdk_dep_name_if_applicable) + relocation.add_replacement_pair(:java, JAVA_PLACEHOLDER, "#{HOMEBREW_PREFIX}/opt/#{openjdk}/libexec") + end relocation end @@ -130,9 +131,11 @@ class Keg end def openjdk_dep_name_if_applicable - runtime_dependencies&.find do |dep| - dep["full_name"].match? Version.formula_optionally_versioned_regex(:openjdk) - end&.fetch("full_name") + 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 def replace_text_in_files(relocation, files: nil)