From 69cd289938103d899affe3889e6cc6d32a27f315 Mon Sep 17 00:00:00 2001 From: Douglas Eichelberger Date: Thu, 28 Dec 2023 12:07:01 -0800 Subject: [PATCH] Remove redirection for default prefixes --- Library/Homebrew/default_prefix.rb | 7 ------- Library/Homebrew/global.rb | 3 ++- 2 files changed, 2 insertions(+), 8 deletions(-) delete mode 100644 Library/Homebrew/default_prefix.rb diff --git a/Library/Homebrew/default_prefix.rb b/Library/Homebrew/default_prefix.rb deleted file mode 100644 index 91c9f878d6..0000000000 --- a/Library/Homebrew/default_prefix.rb +++ /dev/null @@ -1,7 +0,0 @@ -# typed: strict -# frozen_string_literal: true - -module Homebrew - DEFAULT_PREFIX = T.let(ENV.fetch("HOMEBREW_DEFAULT_PREFIX").freeze, String) - DEFAULT_REPOSITORY = T.let(ENV.fetch("HOMEBREW_DEFAULT_REPOSITORY").freeze, String) -end diff --git a/Library/Homebrew/global.rb b/Library/Homebrew/global.rb index 3abfdf0f86..f843a6a6b7 100644 --- a/Library/Homebrew/global.rb +++ b/Library/Homebrew/global.rb @@ -70,11 +70,12 @@ require "env_config" require "macos_version" require "os" require "messages" -require "default_prefix" module Homebrew extend FileUtils + DEFAULT_PREFIX = T.let(ENV.fetch("HOMEBREW_DEFAULT_PREFIX").freeze, String) + DEFAULT_REPOSITORY = T.let(ENV.fetch("HOMEBREW_DEFAULT_REPOSITORY").freeze, String) DEFAULT_CELLAR = "#{DEFAULT_PREFIX}/Cellar".freeze DEFAULT_MACOS_CELLAR = "#{HOMEBREW_DEFAULT_PREFIX}/Cellar".freeze DEFAULT_MACOS_ARM_CELLAR = "#{HOMEBREW_MACOS_ARM_DEFAULT_PREFIX}/Cellar".freeze