Merge pull request #6568 from simono/fix-diagnostic-keepfile

Fix diagnostic when only keep_file is in sbin.
2019-10-09 20:24:30 +01:00 · 2019-10-09 20:24:30 +01:00 · 1f924db7f3
commit 1f924db7f3
parent 108080908f d372031fdc
1 changed files with 3 additions and 1 deletions
--- a/Library/Homebrew/diagnostic.rb
+++ b/Library/Homebrew/diagnostic.rb
@ -424,7 +424,9 @@ module Homebrew

        # Don't complain about sbin not being in the path if it doesn't exist
        sbin = HOMEBREW_PREFIX/"sbin"
-        return unless sbin.directory? && !sbin.children.empty?
+        return unless sbin.directory?
+        return if sbin.children.empty?
+        return if sbin.children.one? && sbin.children.first.basename.to_s == ".keepme"

        <<~EOS
          Homebrew's sbin was not found in your PATH but you have installed