From 8d30912e16670958cfe2436b85c94a42106bbbb4 Mon Sep 17 00:00:00 2001 From: Steven Peters Date: Sat, 19 Oct 2019 17:49:50 -0700 Subject: [PATCH 1/5] os/mac/keg: Frameworks -> MUST_EXIST_DIRECTORIES --- Library/Homebrew/extend/os/mac/keg.rb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Library/Homebrew/extend/os/mac/keg.rb b/Library/Homebrew/extend/os/mac/keg.rb index c0b1e3fcc3..b2b94d36ff 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"]).uniq.sort.freeze end From 875bfbc8d344b77d054828e746c8754b5b1c6ddc Mon Sep 17 00:00:00 2001 From: Steven Peters Date: Sun, 20 Oct 2019 22:15:47 -0700 Subject: [PATCH 2/5] spec_helper: workaround for removing Frameworks --- Library/Homebrew/test/spec_helper.rb | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Library/Homebrew/test/spec_helper.rb b/Library/Homebrew/test/spec_helper.rb index 407567d890..ac5fed7147 100644 --- a/Library/Homebrew/test/spec_helper.rb +++ b/Library/Homebrew/test/spec_helper.rb @@ -198,6 +198,11 @@ RSpec.configure do |config| CoreTap.instance.path/"formula_renames.json", *Pathname.glob("#{HOMEBREW_CELLAR}/*/"), ] + if OS.mac? + FileUtils.rm_rf [ + HOMEBREW_PREFIX/"Frameworks", + ] + end files_after_test = find_files From c2cb6cfa790005b53190de3f2850241d7451da48 Mon Sep 17 00:00:00 2001 From: Steven Peters Date: Mon, 21 Oct 2019 12:26:01 -0700 Subject: [PATCH 3/5] os/mac/keg.rb: uniq.sort -> sort.uniq Co-Authored-By: Mike McQuaid --- Library/Homebrew/extend/os/mac/keg.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Library/Homebrew/extend/os/mac/keg.rb b/Library/Homebrew/extend/os/mac/keg.rb index b2b94d36ff..8f39770182 100644 --- a/Library/Homebrew/extend/os/mac/keg.rb +++ b/Library/Homebrew/extend/os/mac/keg.rb @@ -4,5 +4,5 @@ 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"]).uniq.sort.freeze + MUST_EXIST_DIRECTORIES = (GENERIC_MUST_EXIST_DIRECTORIES + [HOMEBREW_PREFIX/"Frameworks"]).sort.uniq.freeze end From 1ad0addbc8ae015cfef4bb05101302e332f8f1f8 Mon Sep 17 00:00:00 2001 From: Steven Peters Date: Mon, 21 Oct 2019 12:27:39 -0700 Subject: [PATCH 4/5] spec_helper: always remove Frameworks --- Library/Homebrew/test/spec_helper.rb | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/Library/Homebrew/test/spec_helper.rb b/Library/Homebrew/test/spec_helper.rb index ac5fed7147..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", @@ -198,11 +199,6 @@ RSpec.configure do |config| CoreTap.instance.path/"formula_renames.json", *Pathname.glob("#{HOMEBREW_CELLAR}/*/"), ] - if OS.mac? - FileUtils.rm_rf [ - HOMEBREW_PREFIX/"Frameworks", - ] - end files_after_test = find_files From 20e85acec46245400086583c8812d0d021d022f0 Mon Sep 17 00:00:00 2001 From: Steven Peters Date: Mon, 21 Oct 2019 12:29:37 -0700 Subject: [PATCH 5/5] keg: uniq.sort -> sort.uniq --- Library/Homebrew/keg.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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.