diff --git a/Library/Homebrew/extend/os/mac/keg.rb b/Library/Homebrew/extend/os/mac/keg.rb index c0b1e3fcc3..8f39770182 100644 --- a/Library/Homebrew/extend/os/mac/keg.rb +++ b/Library/Homebrew/extend/os/mac/keg.rb @@ -3,4 +3,6 @@ class Keg GENERIC_KEG_LINK_DIRECTORIES = (remove_const :KEG_LINK_DIRECTORIES).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 diff --git a/Library/Homebrew/keg.rb b/Library/Homebrew/keg.rb index 523c027074..83ccdb3272 100644 --- a/Library/Homebrew/keg.rb +++ b/Library/Homebrew/keg.rb @@ -75,7 +75,7 @@ class Keg opt var/homebrew/linked ] - ).map { |dir| HOMEBREW_PREFIX/dir }.uniq.sort.freeze + ).map { |dir| HOMEBREW_PREFIX/dir }.sort.uniq.freeze # Keep relatively in sync with # https://github.com/Homebrew/install/blob/master/install @@ -98,7 +98,7 @@ class Keg HOMEBREW_REPOSITORY, Language::Python.homebrew_site_packages, ] - ).uniq.sort.freeze + ).sort.uniq.freeze # These paths relative to the keg's share directory should always be real # directories in the prefix, never symlinks. diff --git a/Library/Homebrew/test/spec_helper.rb b/Library/Homebrew/test/spec_helper.rb index 407567d890..52ec17548e 100644 --- a/Library/Homebrew/test/spec_helper.rb +++ b/Library/Homebrew/test/spec_helper.rb @@ -185,6 +185,7 @@ RSpec.configure do |config| HOMEBREW_PINNED_KEGS, HOMEBREW_PREFIX/"var", HOMEBREW_PREFIX/"Caskroom", + HOMEBREW_PREFIX/"Frameworks", HOMEBREW_LIBRARY/"Taps/homebrew/homebrew-cask", HOMEBREW_LIBRARY/"Taps/homebrew/homebrew-bar", HOMEBREW_LIBRARY/"Taps/homebrew/homebrew-bundle",