Skip to content

Commit

Permalink
Move 10.11 warning to doctor, pre-install, and post-failure
Browse files Browse the repository at this point in the history
  • Loading branch information
jacknagel committed Jun 17, 2015
1 parent f59b164 commit 72cb403
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 9 deletions.
9 changes: 9 additions & 0 deletions Library/Homebrew/cmd/doctor.rb
Original file line number Diff line number Diff line change
Expand Up @@ -237,6 +237,15 @@ def check_for_broken_symlinks
end
end

def check_for_unsupported_osx
if MacOS.version >= "10.11" then <<-EOS.undent
You are using OS X #{MacOS.version}.
We do not provide support for this pre-release version.
You may encounter build failures or other breakage.
EOS
end
end

if MacOS.version >= "10.9"
def check_for_installed_developer_tools
unless MacOS::Xcode.installed? || MacOS::CLT.installed? then <<-EOS.undent
Expand Down
1 change: 1 addition & 0 deletions Library/Homebrew/cmd/install.rb
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,7 @@ def check_writable_install_location
def check_xcode
checks = Checks.new
%w[
check_for_unsupported_osx
check_for_installed_developer_tools
check_xcode_license_approved
check_for_osx_gcc_installer
Expand Down
5 changes: 5 additions & 0 deletions Library/Homebrew/exceptions.rb
Original file line number Diff line number Diff line change
Expand Up @@ -216,6 +216,11 @@ def dump
puts "These open issues may also help:"
puts issues.map{ |i| "#{i['title']} (#{i['html_url']})" }.join("\n")
end

if MacOS.version >= "10.11"
require "cmd/doctor"
opoo Checks.new.check_for_unsupported_osx
end
end
end

Expand Down
9 changes: 0 additions & 9 deletions Library/brew.rb
Original file line number Diff line number Diff line change
Expand Up @@ -50,15 +50,6 @@
EOABORT
end

if OS.mac? && MacOS.version == "10.11"
opoo <<-EOS.undent
Although Homebrew has added initial recognition of 10.11, it is unsupported.
You may encounter breakage or other failure and there is no guarantee
Homebrew can resolve those issues until El Capitan is stable.
EOS
end

# Many Pathname operations use getwd when they shouldn't, and then throw
# odd exceptions. Reduce our support burden by showing a user-friendly error.
Dir.getwd rescue abort "The current working directory doesn't exist, cannot proceed."
Expand Down

0 comments on commit 72cb403

Please sign in to comment.