Merge pull request #904 from DomT4/sierra

Sierra: update diagnostic message, pkg-config, Xcode doc

2 files changed, 13 insertions, 9 deletions

diff --git a/Library/Homebrew/extend/os/mac/diagnostic.rb b/Library/Homebrew/extend/os/mac/diagnostic.rb
index a2f715890..7fb13af85 100644
--- a/Library/Homebrew/extend/os/mac/diagnostic.rb
+++ b/Library/Homebrew/extend/os/mac/diagnostic.rb
@@ -63,18 +63,22 @@ module Homebrew
       def check_xcode_up_to_date
         return unless MacOS::Xcode.installed? && MacOS::Xcode.outdated?
 
+        message = <<-EOS.undent
+          Your Xcode (#{MacOS::Xcode.version}) is outdated
+          Please update to Xcode #{MacOS::Xcode.latest_version}.
+          #{MacOS::Xcode.update_instructions}
+        EOS
+
         if OS::Mac.prerelease?
-          xcode_select_nudge = <<-EOS.undent
+          current_path = Utils.popen_read("/usr/bin/xcode-select", "-p")
+          message += <<-EOS.undent
             If #{MacOS::Xcode.latest_version} is installed, you may need to:
-              sudo xcode-select --switch /path/to/Xcode-beta.app
+              sudo xcode-select --switch /Applications/Xcode.app
+            Current developer directory is:
+              #{current_path}
           EOS
         end
-
-        <<-EOS.undent
-          Your Xcode (#{MacOS::Xcode.version}) is outdated
-          Please update to Xcode #{MacOS::Xcode.latest_version}.
-          #{MacOS::Xcode.update_instructions}#{xcode_select_nudge}
-        EOS
+        message
       end
 
       def check_clt_up_to_date
diff --git a/Library/Homebrew/os/mac/pkgconfig/10.12/sqlite3.pc b/Library/Homebrew/os/mac/pkgconfig/10.12/sqlite3.pc
index 98c1575eb..da7a06981 100644
--- a/Library/Homebrew/os/mac/pkgconfig/10.12/sqlite3.pc
+++ b/Library/Homebrew/os/mac/pkgconfig/10.12/sqlite3.pc
@@ -5,7 +5,7 @@ includedir=${prefix}/include
 
 Name: SQLite
 Description: SQL database engine
-Version: 3.13.0
+Version: 3.14.0
 Libs: -L${libdir} -lsqlite3
 Libs.private:
 Cflags: -I${includedir}