From 878b79d456683aa55a4f6af17eb2bd9ec4a8e5e2 Mon Sep 17 00:00:00 2001 From: Ivan Verevkin Date: Tue, 17 Sep 2019 11:06:48 +0200 Subject: [PATCH 1/3] install: create `.keepme` files in directories. --- Library/Homebrew/install.rb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Library/Homebrew/install.rb b/Library/Homebrew/install.rb index 215845e362..1eec217d2d 100644 --- a/Library/Homebrew/install.rb +++ b/Library/Homebrew/install.rb @@ -24,6 +24,9 @@ module Homebrew Keg::MUST_EXIST_DIRECTORIES.each do |dir| begin FileUtils.mkdir_p(dir) unless dir.exist? + + keep_file = "#{dir}/.keepme" + FileUtils.touch(keep_file) unless keep_file.exist? rescue nil end From 8d6ac3869cce18abe6a793e6a713d52dfb65ad7f Mon Sep 17 00:00:00 2001 From: Mike McQuaid Date: Wed, 18 Sep 2019 09:40:18 +0100 Subject: [PATCH 2/3] install: keep_file must be a Pathname. --- Library/Homebrew/install.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Library/Homebrew/install.rb b/Library/Homebrew/install.rb index 1eec217d2d..8ede763fc1 100644 --- a/Library/Homebrew/install.rb +++ b/Library/Homebrew/install.rb @@ -25,7 +25,7 @@ module Homebrew begin FileUtils.mkdir_p(dir) unless dir.exist? - keep_file = "#{dir}/.keepme" + keep_file = dir/".keepme" FileUtils.touch(keep_file) unless keep_file.exist? rescue nil From 704ea4b4bb4f0253657639399df9626eac14a9f4 Mon Sep 17 00:00:00 2001 From: Mike McQuaid Date: Wed, 18 Sep 2019 09:43:29 +0100 Subject: [PATCH 3/3] install: add comment explaining why we're creating these files. --- Library/Homebrew/install.rb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Library/Homebrew/install.rb b/Library/Homebrew/install.rb index 8ede763fc1..1d07053e03 100644 --- a/Library/Homebrew/install.rb +++ b/Library/Homebrew/install.rb @@ -25,6 +25,9 @@ module Homebrew begin FileUtils.mkdir_p(dir) unless dir.exist? + # Create these files to ensure that these directories aren't removed + # by the Catalina installer. + # (https://github.com/Homebrew/brew/issues/6263) keep_file = dir/".keepme" FileUtils.touch(keep_file) unless keep_file.exist? rescue