Skip to content

Commit

Permalink
diagnostic: more porting to generic OS. (#449)
Browse files Browse the repository at this point in the history
  • Loading branch information
MikeMcQuaid authored Jul 4, 2016
1 parent a1b0ef1 commit 59074e9
Show file tree
Hide file tree
Showing 3 changed files with 28 additions and 9 deletions.
12 changes: 3 additions & 9 deletions Library/Homebrew/cmd/install.rb
Original file line number Diff line number Diff line change
Expand Up @@ -218,15 +218,9 @@ def check_writable_install_location
raise "Cannot write to #{HOMEBREW_PREFIX}" unless HOMEBREW_PREFIX.writable_real? || HOMEBREW_PREFIX.to_s == "/usr/local"
end

def check_xcode
def check_development_tools
checks = Diagnostic::Checks.new
%w[
check_for_unsupported_osx
check_for_bad_install_name_tool
check_for_installed_developer_tools
check_xcode_license_approved
check_for_osx_gcc_installer
].each do |check|
checks.all_development_tools_checks.each do |check|
out = checks.send(check)
opoo out unless out.nil?
end
Expand All @@ -252,7 +246,7 @@ def check_cellar
def perform_preinstall_checks
check_ppc
check_writable_install_location
check_xcode if MacOS.has_apple_developer_tools?
check_development_tools if DevelopmentTools.installed?
check_cellar
end

Expand Down
15 changes: 15 additions & 0 deletions Library/Homebrew/diagnostic.rb
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,21 @@ def inject_file_list(list, str)
end
############# END HELPERS

def all_development_tools_checks
%w[
check_for_installed_developer_tools
]
end

def check_for_installed_developer_tools
return if DevelopmentTools.installed?

<<-EOS.undent
No developer tools installed.
Install clang or gcc.
EOS
end

# See https://github.com/Homebrew/legacy-homebrew/pull/9986
def check_path_for_trailing_slashes
all_paths = ENV["PATH"].split(File::PATH_SEPARATOR)
Expand Down
10 changes: 10 additions & 0 deletions Library/Homebrew/extend/os/mac/diagnostic.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,16 @@
module Homebrew
module Diagnostic
class Checks
def all_development_tools_checks
%w[
check_for_unsupported_osx
check_for_bad_install_name_tool
check_for_installed_developer_tools
check_xcode_license_approved
check_for_osx_gcc_installer
]
end

def check_for_unsupported_osx
return if ARGV.homebrew_developer?

Expand Down

0 comments on commit 59074e9

Please sign in to comment.