From ed4129b580072a84929f59af6ddfeee8a56d456a Mon Sep 17 00:00:00 2001 From: Douglas Eichelberger Date: Mon, 7 Oct 2024 19:45:48 -0700 Subject: [PATCH] Remove removable constants --- Library/Homebrew/extend/os/mac/keg.rb | 16 ---------------- Library/Homebrew/keg.rb | 26 -------------------------- 2 files changed, 42 deletions(-) diff --git a/Library/Homebrew/extend/os/mac/keg.rb b/Library/Homebrew/extend/os/mac/keg.rb index e4c5860363..aae4eb6ad3 100644 --- a/Library/Homebrew/extend/os/mac/keg.rb +++ b/Library/Homebrew/extend/os/mac/keg.rb @@ -3,22 +3,6 @@ require "system_command" -class Keg - # TODO: re-implement these as functions, so that we aren't modifying constants: - GENERIC_KEG_LINK_DIRECTORIES = (remove_const :KEG_LINK_DIRECTORIES).freeze - KEG_LINK_DIRECTORIES = (GENERIC_KEG_LINK_DIRECTORIES + ["Frameworks"]).freeze - GENERIC_MUST_EXIST_SUBDIRECTORIES = (remove_const :MUST_EXIST_SUBDIRECTORIES).freeze - MUST_EXIST_SUBDIRECTORIES = ( - GENERIC_MUST_EXIST_SUBDIRECTORIES + - [HOMEBREW_PREFIX/"Frameworks"] - ).sort.uniq.freeze - GENERIC_MUST_BE_WRITABLE_DIRECTORIES = (remove_const :MUST_BE_WRITABLE_DIRECTORIES).freeze - MUST_BE_WRITABLE_DIRECTORIES = ( - GENERIC_MUST_BE_WRITABLE_DIRECTORIES + - [HOMEBREW_PREFIX/"Frameworks"] - ).sort.uniq.freeze -end - module OS module Mac module Keg diff --git a/Library/Homebrew/keg.rb b/Library/Homebrew/keg.rb index 7d1a332a30..0b0f67d256 100644 --- a/Library/Homebrew/keg.rb +++ b/Library/Homebrew/keg.rb @@ -78,32 +78,6 @@ class Keg # Locale-specific directories have the form `language[_territory][.codeset][@modifier]` LOCALEDIR_RX = %r{(locale|man)/([a-z]{2}|C|POSIX)(_[A-Z]{2})?(\.[a-zA-Z\-0-9]+(@.+)?)?} INFOFILE_RX = %r{info/([^.].*?\.info(\.gz)?|dir)$} - KEG_LINK_DIRECTORIES = %w[ - bin etc include lib sbin share var - ].freeze - MUST_EXIST_SUBDIRECTORIES = ( - KEG_LINK_DIRECTORIES - %w[var] + %w[ - opt - var/homebrew/linked - ] - ).map { |dir| HOMEBREW_PREFIX/dir }.sort.uniq.freeze - MUST_BE_WRITABLE_DIRECTORIES = ( - %w[ - etc/bash_completion.d lib/pkgconfig - share/aclocal share/doc share/info share/locale share/man - share/man/man1 share/man/man2 share/man/man3 share/man/man4 - share/man/man5 share/man/man6 share/man/man7 share/man/man8 - share/zsh share/zsh/site-functions - var/log - ].map { |dir| HOMEBREW_PREFIX/dir } + MUST_EXIST_SUBDIRECTORIES + [ - HOMEBREW_CACHE, - HOMEBREW_CELLAR, - HOMEBREW_LOCKS, - HOMEBREW_LOGS, - HOMEBREW_REPOSITORY, - Language::Python.homebrew_site_packages, - ] - ).sort.uniq.freeze # These paths relative to the keg's share directory should always be real # directories in the prefix, never symlinks.