From 842d6ce8bdc2296869c41c5866bbf5f046ac6eb8 Mon Sep 17 00:00:00 2001 From: Mike McQuaid Date: Thu, 15 Sep 2016 09:20:39 +0100 Subject: [PATCH] keg: add ALL_TOP_LEVEL_DIRECTORIES constant. This is used in diagnostic (and will be used in other places later) rather than hard-coding other directories later. --- Library/Homebrew/diagnostic.rb | 3 +-- Library/Homebrew/keg.rb | 1 + 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Library/Homebrew/diagnostic.rb b/Library/Homebrew/diagnostic.rb index 1b3018251f..7cc6371bd8 100644 --- a/Library/Homebrew/diagnostic.rb +++ b/Library/Homebrew/diagnostic.rb @@ -308,8 +308,7 @@ module Homebrew def check_access_prefix_directories not_writable_dirs = [] - extra_dirs = ["lib/pkgconfig", "share/locale", "share/man", "opt"] - (Keg::TOP_LEVEL_DIRECTORIES + extra_dirs).each do |dir| + Keg::ALL_TOP_LEVEL_DIRECTORIES.each do |dir| path = HOMEBREW_PREFIX/dir next unless path.exist? next if path.writable_real? diff --git a/Library/Homebrew/keg.rb b/Library/Homebrew/keg.rb index bc4b9ed6e8..d409943685 100644 --- a/Library/Homebrew/keg.rb +++ b/Library/Homebrew/keg.rb @@ -65,6 +65,7 @@ class Keg LOCALEDIR_RX = /(locale|man)\/([a-z]{2}|C|POSIX)(_[A-Z]{2})?(\.[a-zA-Z\-0-9]+(@.+)?)?/ INFOFILE_RX = %r{info/([^.].*?\.info|dir)$} TOP_LEVEL_DIRECTORIES = %w[bin etc include lib sbin share var Frameworks] + ALL_TOP_LEVEL_DIRECTORIES = (TOP_LEVEL_DIRECTORIES + %w[lib/pkgconfig share/locale share/man opt]).freeze PRUNEABLE_DIRECTORIES = %w[bin etc include lib sbin share Frameworks LinkedKegs].map do |d| case d when "LinkedKegs" then HOMEBREW_LIBRARY/d else HOMEBREW_PREFIX/d end end