Merge pull request #16407 from dduugg/default-prefixes

Remove redirection for default prefixes
This commit is contained in:
Douglas Eichelberger 2024-02-19 09:48:26 -08:00 committed by GitHub
commit ab62a717b9
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 2 additions and 16 deletions

View File

@ -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

View File

@ -70,11 +70,12 @@ require "env_config"
require "macos_version" require "macos_version"
require "os" require "os"
require "messages" require "messages"
require "default_prefix"
module Homebrew module Homebrew
extend FileUtils 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_CELLAR = "#{DEFAULT_PREFIX}/Cellar".freeze
DEFAULT_MACOS_CELLAR = "#{HOMEBREW_DEFAULT_PREFIX}/Cellar".freeze DEFAULT_MACOS_CELLAR = "#{HOMEBREW_DEFAULT_PREFIX}/Cellar".freeze
DEFAULT_MACOS_ARM_CELLAR = "#{HOMEBREW_MACOS_ARM_DEFAULT_PREFIX}/Cellar".freeze DEFAULT_MACOS_ARM_CELLAR = "#{HOMEBREW_MACOS_ARM_DEFAULT_PREFIX}/Cellar".freeze

View File

@ -1,8 +0,0 @@
# typed: strict
# frozen_string_literal: true
module Homebrew
# For testing's sake always assume the default prefix
DEFAULT_PREFIX = T.let(HOMEBREW_PREFIX.to_s.freeze, String)
DEFAULT_REPOSITORY = T.let(HOMEBREW_REPOSITORY.to_s.freeze, String)
end