From 2b6e58063694e2a676d647dfa247d61229623d62 Mon Sep 17 00:00:00 2001 From: Mike McQuaid Date: Wed, 8 Sep 2021 12:35:36 +0100 Subject: [PATCH] ENV/super: add `shims_path` helper method. This allows us to stop repeatedly hardcoding this on macOS/Linux in formulae. --- Library/Homebrew/extend/ENV/super.rb | 7 +++++++ Library/Homebrew/extend/os/linux/extend/ENV/super.rb | 8 +++++++- Library/Homebrew/extend/os/mac/extend/ENV/super.rb | 8 +++++++- 3 files changed, 21 insertions(+), 2 deletions(-) diff --git a/Library/Homebrew/extend/ENV/super.rb b/Library/Homebrew/extend/ENV/super.rb index 5534cc8b00..acd68e8358 100644 --- a/Library/Homebrew/extend/ENV/super.rb +++ b/Library/Homebrew/extend/ENV/super.rb @@ -29,6 +29,13 @@ module Superenv base.run_time_deps = [] end + # The location of Homebrew's shims on this OS. + # @public + sig { returns(Pathname) } + def self.shims_path + HOMEBREW_SHIMS_PATH/"super" + end + # @private sig { returns(T.nilable(Pathname)) } def self.bin; end diff --git a/Library/Homebrew/extend/os/linux/extend/ENV/super.rb b/Library/Homebrew/extend/os/linux/extend/ENV/super.rb index 07675d4135..19c8de1fbf 100644 --- a/Library/Homebrew/extend/os/linux/extend/ENV/super.rb +++ b/Library/Homebrew/extend/os/linux/extend/ENV/super.rb @@ -4,9 +4,15 @@ module Superenv extend T::Sig + # The location of Homebrew's shims on Linux. + # @public + def self.shims_path + HOMEBREW_SHIMS_PATH/"linux/super" + end + # @private def self.bin - (HOMEBREW_SHIMS_PATH/"linux/super").realpath + shims_path.realpath end # @private diff --git a/Library/Homebrew/extend/os/mac/extend/ENV/super.rb b/Library/Homebrew/extend/os/mac/extend/ENV/super.rb index e58a10e577..e1f64d1d41 100644 --- a/Library/Homebrew/extend/os/mac/extend/ENV/super.rb +++ b/Library/Homebrew/extend/os/mac/extend/ENV/super.rb @@ -5,13 +5,19 @@ module Superenv extend T::Sig class << self + # The location of Homebrew's shims on macOS. + # @public + def shims_path + HOMEBREW_SHIMS_PATH/"mac/super" + end + undef bin # @private def bin return unless DevelopmentTools.installed? - (HOMEBREW_SHIMS_PATH/"mac/super").realpath + shims_path.realpath end end