aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJack Nagel2014-10-28 22:49:40 -0500
committerJack Nagel2014-10-28 22:49:40 -0500
commitad4edb94d753029fd7acef87733e2078c1fd644d (patch)
tree1246280ceb434f456a9631eda5fb0d69ecaf0504
parentf281ea3a57731987cd7ca2245f01db11c185d2ac (diff)
downloadbrew-ad4edb94d753029fd7acef87733e2078c1fd644d.tar.bz2
Whitelist config scripts from OS X Server
Closes Homebrew/homebrew#33398.
-rw-r--r--Library/Homebrew/cmd/doctor.rb9
1 files changed, 7 insertions, 2 deletions
diff --git a/Library/Homebrew/cmd/doctor.rb b/Library/Homebrew/cmd/doctor.rb
index 27b108288..3d49f79d8 100644
--- a/Library/Homebrew/cmd/doctor.rb
+++ b/Library/Homebrew/cmd/doctor.rb
@@ -656,8 +656,13 @@ def check_for_config_scripts
scripts = []
- whitelist = %W[/usr/bin /usr/sbin /usr/X11/bin /usr/X11R6/bin /opt/X11/bin #{HOMEBREW_PREFIX}/bin #{HOMEBREW_PREFIX}/sbin]
- whitelist.map! { |d| d.downcase }
+ whitelist = %W[
+ /usr/bin /usr/sbin
+ /usr/X11/bin /usr/X11R6/bin /opt/X11/bin
+ #{HOMEBREW_PREFIX}/bin #{HOMEBREW_PREFIX}/sbin
+ /Applications/Server.app/Contents/ServerRoot/usr/bin
+ /Applications/Server.app/Contents/ServerRoot/usr/sbin
+ ].map(&:downcase)
paths.each do |p|
next if whitelist.include?(p.downcase) ||