admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

doctor: reorganize check_for_macgpg2

Browse Source
This commit is contained in:
Jack Nagel 2013-05-23 23:28:16 -05:00
parent 187b9c9d59
commit 8b98e83347
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Library/Homebrew/cmd/doctor.rb
View File

@ -82,15 +82,20 @@ end
# Installing MacGPG2 interferes with Homebrew in a big way
# http://sourceforge.net/projects/macgpg2/files/
def check_for_macgpg2
if %w{/Applications/start-gpg-agent.app
/Library/Receipts/libiconv1.pkg
/usr/local/MacGPG2}.any? { |f| File.exist? f }
<<-EOS.undent
return if File.exist? '/usr/local/MacGPG2/share/gnupg/VERSION'
suspects = %w{
/Applications/start-gpg-agent.app
/Library/Receipts/libiconv1.pkg
/usr/local/MacGPG2
}
if suspects.any? { |f| File.exist? f } then <<-EOS.undent
You may have installed MacGPG2 via the package installer.
Several other checks in this script will turn up problems, such as stray
dylibs in /usr/local and permissions issues with share and man in /usr/local/.
EOS
end unless File.exist? '/usr/local/MacGPG2/share/gnupg/VERSION'
end
end
def __check_stray_files(pattern, white_list, message)