admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

Merge pull request #6620 from scpeters/must_exist_frameworks

Browse Source 
os/mac/keg: Frameworks -> MUST_EXIST_DIRECTORIES
This commit is contained in:
Mike McQuaid 2019-10-22 09:15:51 +01:00 committed by GitHub
commit cddf402365
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Library/Homebrew/extend/os/mac/keg.rb
View File

@ -3,4 +3,6 @@
class Keg class Keg
GENERIC_KEG_LINK_DIRECTORIES = (remove_const :KEG_LINK_DIRECTORIES).freeze GENERIC_KEG_LINK_DIRECTORIES = (remove_const :KEG_LINK_DIRECTORIES).freeze
KEG_LINK_DIRECTORIES = (GENERIC_KEG_LINK_DIRECTORIES + ["Frameworks"]).freeze KEG_LINK_DIRECTORIES = (GENERIC_KEG_LINK_DIRECTORIES + ["Frameworks"]).freeze
GENERIC_MUST_EXIST_DIRECTORIES = (remove_const :MUST_EXIST_DIRECTORIES).freeze
MUST_EXIST_DIRECTORIES = (GENERIC_MUST_EXIST_DIRECTORIES + [HOMEBREW_PREFIX/"Frameworks"]).sort.uniq.freeze
end end

4
Library/Homebrew/keg.rb
View File

@ -75,7 +75,7 @@ class Keg
opt opt
var/homebrew/linked var/homebrew/linked
] ]
).map { |dir| HOMEBREW_PREFIX/dir }.uniq.sort.freeze ).map { |dir| HOMEBREW_PREFIX/dir }.sort.uniq.freeze
# Keep relatively in sync with # Keep relatively in sync with
# https://github.com/Homebrew/install/blob/master/install # https://github.com/Homebrew/install/blob/master/install
@ -98,7 +98,7 @@ class Keg
HOMEBREW_REPOSITORY, HOMEBREW_REPOSITORY,
Language::Python.homebrew_site_packages, Language::Python.homebrew_site_packages,
] ]
).uniq.sort.freeze ).sort.uniq.freeze
# These paths relative to the keg's share directory should always be real # These paths relative to the keg's share directory should always be real
# directories in the prefix, never symlinks. # directories in the prefix, never symlinks.

1
Library/Homebrew/test/spec_helper.rb
View File

@ -185,6 +185,7 @@ RSpec.configure do |config|
HOMEBREW_PINNED_KEGS, HOMEBREW_PINNED_KEGS,
HOMEBREW_PREFIX/"var", HOMEBREW_PREFIX/"var",
HOMEBREW_PREFIX/"Caskroom", HOMEBREW_PREFIX/"Caskroom",
HOMEBREW_PREFIX/"Frameworks",
HOMEBREW_LIBRARY/"Taps/homebrew/homebrew-cask", HOMEBREW_LIBRARY/"Taps/homebrew/homebrew-cask",
HOMEBREW_LIBRARY/"Taps/homebrew/homebrew-bar", HOMEBREW_LIBRARY/"Taps/homebrew/homebrew-bar",
HOMEBREW_LIBRARY/"Taps/homebrew/homebrew-bundle", HOMEBREW_LIBRARY/"Taps/homebrew/homebrew-bundle",