From 84e41194cb20c2a88d6c3cfcf51575fce6eb4f02 Mon Sep 17 00:00:00 2001
From: "L. E. Segovia" <amyspark@users.noreply.github.com>
Date: Fri, 3 Nov 2017 19:09:53 -0300
Subject: [PATCH 01/69] Let Cask doctor exit with 1 via a CaskError

---
 Library/Homebrew/cask/lib/hbc/cli/doctor.rb | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/Library/Homebrew/cask/lib/hbc/cli/doctor.rb b/Library/Homebrew/cask/lib/hbc/cli/doctor.rb
index d7bcf15379..e439c871b4 100644
--- a/Library/Homebrew/cask/lib/hbc/cli/doctor.rb
+++ b/Library/Homebrew/cask/lib/hbc/cli/doctor.rb
@@ -3,6 +3,8 @@ require "system_config"
 module Hbc
   class CLI
     class Doctor < AbstractCommand
+      attr_accessor :failed
+
       def initialize(*)
         super
         return if args.empty?
@@ -35,6 +37,8 @@ module Hbc
         ]
 
         (self.class.locale_variables + environment_variables).sort.each(&self.class.method(:render_env_var))
+
+        raise CaskError, "One or more checks failed." if @failed
       end
 
       def self.locale_variables
@@ -61,6 +65,7 @@ module Hbc
       def self.cask_count_for_tap(tap)
         Formatter.pluralize(tap.cask_files.count, "cask")
       rescue StandardError
+        @failed = true
         "0 #{error_string "error reading #{tap.path}"}"
       end
 
@@ -92,6 +97,7 @@ module Hbc
         if locations.empty?
           none_string
         else
+          @failed = true
           locations.collect do |l|
             "#{l} #{error_string 'error: legacy install. Run "brew uninstall --force brew-cask".'}"
           end
@@ -101,8 +107,10 @@ module Hbc
       def self.render_staging_location(path)
         path = Pathname.new(user_tilde(path.to_s))
         if !path.exist?
+          @failed = true
           "#{path} #{error_string "error: path does not exist"}"
         elsif !path.writable?
+          @failed = true
           "#{path} #{error_string "error: not writable by current user"}"
         else
           path

From 691caf4b54bb17d183aefc48e0a39bbaa0d19739 Mon Sep 17 00:00:00 2001
From: "L. E. Segovia" <amyspark@users.noreply.github.com>
Date: Sat, 2 Dec 2017 00:53:54 +0000
Subject: [PATCH 02/69] Refactor Cask's doctor command - Remove :failed - Use
 Checkable to store the status and warnings/errors - Refactor the methods
 using audit as basis

---
 Library/Homebrew/cask/lib/hbc/cli/doctor.rb | 127 ++++++++++++++++++--
 1 file changed, 114 insertions(+), 13 deletions(-)

diff --git a/Library/Homebrew/cask/lib/hbc/cli/doctor.rb b/Library/Homebrew/cask/lib/hbc/cli/doctor.rb
index e439c871b4..ff4a37bcfc 100644
--- a/Library/Homebrew/cask/lib/hbc/cli/doctor.rb
+++ b/Library/Homebrew/cask/lib/hbc/cli/doctor.rb
@@ -1,9 +1,10 @@
 require "system_config"
+require "hbc/checkable"
 
 module Hbc
   class CLI
     class Doctor < AbstractCommand
-      attr_accessor :failed
+      include Checkable
 
       def initialize(*)
         super
@@ -11,16 +12,103 @@ module Hbc
         raise ArgumentError, "#{self.class.command_name} does not take arguments."
       end
 
+      def success?
+        !(errors? || warnings?)
+      end
+
+      def summary_header
+        "Cask's Doctor checkup"
+      end
+
       def run
+        check_software_versions
+        check_install_location
+        check_staging_location
+        check_taps
+        check_load_path
+        check_environment_variables
+
+        puts summary unless success?
+        raise CaskError, "Your system is not ready for Cask." unless success?
+      end
+
+      def check_software_versions
         ohai "Homebrew-Cask Version", Hbc.full_version
         ohai "macOS", MacOS.full_version
         ohai "Java", SystemConfig.describe_java
-        ohai "Homebrew-Cask Install Location", self.class.render_install_location
-        ohai "Homebrew-Cask Staging Location", self.class.render_staging_location(Hbc.caskroom)
-        ohai "Homebrew-Cask Cached Downloads", self.class.render_cached_downloads
+      end
+
+      # This could be done by calling into Homebrew, but the situation
+      # where "doctor" is needed is precisely the situation where such
+      # things are less dependable.
+      def check_install_location
+        ohai "Homebrew-Cask Install Location"
+
+        locations = Dir.glob(HOMEBREW_CELLAR.join("brew-cask", "*")).reverse
+        if locations.empty?
+          puts self.class.none_string
+        else
+          locations.collect do |l|
+            add_error "Legacy install at #{l}. Run \"brew uninstall --force brew-cask\"."
+            puts l
+          end
+        end
+      end
+
+      def check_staging_location
+        ohai "Homebrew-Cask Staging Location"
+
+        path = Pathname.new(user_tilde(Hbc.caskroom.to_s))
+
+        if !path.exist?
+          add_error "The staging path #{path} does not exist."
+        elsif !path.writable?
+          add_error "The staging path #{path} is not writable by the current user."
+        end
+
+        puts path
+      end
+
+      def check_cached_downloads
+        ohai "Homebrew-Cask Cached Downloads"
+
+        cleanup = CLI::Cleanup.new
+        count = cleanup.cache_files.count
+        size = cleanup.disk_cleanup_size
+        msg = user_tilde(Hbc.cache.to_s)
+        msg << " (#{number_readable(count)} files, #{disk_usage_readable(size)})" unless count.zero?
+        puts msg
+      end
+
+      def check_taps
         ohai "Homebrew-Cask Taps:"
-        puts self.class.render_taps(Hbc.default_tap, *self.class.alt_taps)
-        ohai "Contents of $LOAD_PATH", self.class.render_load_path($LOAD_PATH)
+
+        default_tap = [Hbc.default_tap]
+
+        alt_taps = Tap.select { |t| t.cask_dir.exist? && t != Hbc.default_tap }
+
+        (default_tap + alt_taps).each do |tap|
+          if tap.path.nil? || tap.path.to_s.empty?
+            puts none_string
+          else
+            puts "#{tap.path} (#{cask_count_for_tap(tap)})"
+          end
+        end
+      end
+
+      def check_load_path
+        ohai "Contents of $LOAD_PATH"
+        paths = $LOAD_PATH.map(&method(:user_tilde))
+
+        if paths.empty?
+          puts none_string
+          add_error "$LOAD_PATH is empty"
+        else
+          puts paths
+        end
+      end
+
+      def check_environment_variables
         ohai "Environment Variables"
 
         environment_variables = %w[
@@ -36,9 +124,25 @@ module Hbc
           SHELL
         ]
 
-        (self.class.locale_variables + environment_variables).sort.each(&self.class.method(:render_env_var))
+        locale_variables = ENV.keys.grep(/^(?:LC_\S+|LANG|LANGUAGE)\Z/).sort
 
-        raise CaskError, "One or more checks failed." if @failed
+        (locale_variables + environment_variables).sort.each(&method(:render_env_var))
+      end
+
+      def user_tilde(path)
+        self.class.user_tilde(path)
+      end
+
+      def cask_count_for_tap(tap)
+        self.class.cask_count_for_tap(tap)
+      end
+
+      def none_string
+        self.class.none_string
+      end
+
+      def render_env_var(var)
+        self.class.render_env_var(var)
       end
 
       def self.locale_variables
@@ -65,8 +169,8 @@ module Hbc
       def self.cask_count_for_tap(tap)
         Formatter.pluralize(tap.cask_files.count, "cask")
       rescue StandardError
-        @failed = true
-        "0 #{error_string "error reading #{tap.path}"}"
+        add_error "Unable to read from Tap: #{tap.path}"
+        "0"
       end
 
       def self.render_taps(*taps)
@@ -97,7 +201,6 @@ module Hbc
         if locations.empty?
           none_string
         else
-          @failed = true
           locations.collect do |l|
             "#{l} #{error_string 'error: legacy install. Run "brew uninstall --force brew-cask".'}"
           end
@@ -107,10 +210,8 @@ module Hbc
       def self.render_staging_location(path)
         path = Pathname.new(user_tilde(path.to_s))
         if !path.exist?
-          @failed = true
           "#{path} #{error_string "error: path does not exist"}"
         elsif !path.writable?
-          @failed = true
           "#{path} #{error_string "error: not writable by current user"}"
         else
           path

From 06f2b50ee4b1b5db6737c4dc670536ca97cc7bb4 Mon Sep 17 00:00:00 2001
From: Kevin Abel <kevin.abel.0@gmail.com>
Date: Tue, 9 Jan 2018 19:56:54 -0600
Subject: [PATCH 03/69] Fix cached download file extension for certain URL

PHP URLs have the downloadable file in the middle of the pathname. If no
extension is detected, continue up the pathname.
---
 Library/Homebrew/download_strategy.rb             |  6 +++++-
 Library/Homebrew/test/download_strategies_spec.rb | 13 +++++++++++++
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/Library/Homebrew/download_strategy.rb b/Library/Homebrew/download_strategy.rb
index feb518057f..6869d33703 100644
--- a/Library/Homebrew/download_strategy.rb
+++ b/Library/Homebrew/download_strategy.rb
@@ -303,7 +303,11 @@ class AbstractFileDownloadStrategy < AbstractDownloadStrategy
     # We can't use basename_without_params, because given a URL like
     #   https://example.com/download.php?file=foo-1.0.tar.gz
     # the extension we want is ".tar.gz", not ".php".
-    Pathname.new(@url).extname[/[^?]+/]
+    url_pathname = Pathname.new(@url)
+    while !ext = url_pathname.extname[/[^?]+/]
+      url_pathname = url_pathname.dirname
+    end
+    ext
   end
 end
 
diff --git a/Library/Homebrew/test/download_strategies_spec.rb b/Library/Homebrew/test/download_strategies_spec.rb
index 06d6fa855c..7ad070fc44 100644
--- a/Library/Homebrew/test/download_strategies_spec.rb
+++ b/Library/Homebrew/test/download_strategies_spec.rb
@@ -209,6 +209,19 @@ describe CurlDownloadStrategy do
   it "parses the opts and sets the corresponding args" do
     expect(subject.send(:_curl_opts)).to eq(["--user", "download:123456"])
   end
+
+  describe "#tarball_path" do
+    subject { described_class.new(name, resource).tarball_path }
+
+    context "when URL ends with file" do
+      it { is_expected.to eq(HOMEBREW_CACHE/"foo-.tar.gz") }
+    end
+
+    context "when URL file is in middle" do
+      let(:url) { "http://example.com/foo.tar.gz/from/this/mirror" }
+      it { is_expected.to eq(HOMEBREW_CACHE/"foo-.tar.gz") }
+    end
+  end
 end
 
 describe DownloadStrategyDetector do

From dca8dc5bf50c508eadf051d4316cec12dacf7674 Mon Sep 17 00:00:00 2001
From: Kevin Abel <kevin.abel.0@gmail.com>
Date: Tue, 9 Jan 2018 20:11:52 -0600
Subject: [PATCH 04/69] Fix audit

---
 Library/Homebrew/download_strategy.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Library/Homebrew/download_strategy.rb b/Library/Homebrew/download_strategy.rb
index 6869d33703..3419475445 100644
--- a/Library/Homebrew/download_strategy.rb
+++ b/Library/Homebrew/download_strategy.rb
@@ -304,7 +304,7 @@ class AbstractFileDownloadStrategy < AbstractDownloadStrategy
     #   https://example.com/download.php?file=foo-1.0.tar.gz
     # the extension we want is ".tar.gz", not ".php".
     url_pathname = Pathname.new(@url)
-    while !ext = url_pathname.extname[/[^?]+/]
+    until ext = url_pathname.extname[/[^?]+/]
       url_pathname = url_pathname.dirname
     end
     ext

From 0254605cd52b1bb92ffe33114c671cc111c5a687 Mon Sep 17 00:00:00 2001
From: Kevin Abel <kevin.abel.0@gmail.com>
Date: Sat, 13 Jan 2018 17:06:21 -0600
Subject: [PATCH 05/69] Handle reaching the top of a URL which searching for
 file ext

Should never reach this as most URL's will have a domain name that will
be caught as an extname.
---
 Library/Homebrew/download_strategy.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Library/Homebrew/download_strategy.rb b/Library/Homebrew/download_strategy.rb
index 3419475445..2774f2fadb 100644
--- a/Library/Homebrew/download_strategy.rb
+++ b/Library/Homebrew/download_strategy.rb
@@ -306,6 +306,7 @@ class AbstractFileDownloadStrategy < AbstractDownloadStrategy
     url_pathname = Pathname.new(@url)
     until ext = url_pathname.extname[/[^?]+/]
       url_pathname = url_pathname.dirname
+      return if url_pathname.to_s == "."
     end
     ext
   end

From 4c5e3d04e1914f98c326e5bcd3b22acd4a54c782 Mon Sep 17 00:00:00 2001
From: "L. E. Segovia" <amyspark@users.noreply.github.com>
Date: Mon, 29 Jan 2018 13:43:21 +0000
Subject: [PATCH 06/69] Fix @reitermarkus's comments

---
 Library/Homebrew/cask/lib/hbc/cli/doctor.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Library/Homebrew/cask/lib/hbc/cli/doctor.rb b/Library/Homebrew/cask/lib/hbc/cli/doctor.rb
index ff4a37bcfc..1ad5eaff55 100644
--- a/Library/Homebrew/cask/lib/hbc/cli/doctor.rb
+++ b/Library/Homebrew/cask/lib/hbc/cli/doctor.rb
@@ -17,7 +17,7 @@ module Hbc
       end
 
       def summary_header
-        "Cask's Doctor checkup"
+        "Cask's Doctor Checkup"
       end
 
       def run
@@ -29,7 +29,7 @@ module Hbc
         check_environment_variables
 
         puts summary unless success?
-        raise CaskError, "Your system is not ready for Cask." unless success?
+        raise CaskError, "There are some problems with your setup." unless success?
       end
 
       def check_software_versions

From 601af55b43bc96627359eca06eeec4bf9881c890 Mon Sep 17 00:00:00 2001
From: Kevin Abel <kevin.abel.0@gmail.com>
Date: Fri, 2 Feb 2018 18:15:05 -0600
Subject: [PATCH 07/69] Add root dirname as a escape value too

---
 Library/Homebrew/download_strategy.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Library/Homebrew/download_strategy.rb b/Library/Homebrew/download_strategy.rb
index 2774f2fadb..ed316fa7fb 100644
--- a/Library/Homebrew/download_strategy.rb
+++ b/Library/Homebrew/download_strategy.rb
@@ -306,7 +306,7 @@ class AbstractFileDownloadStrategy < AbstractDownloadStrategy
     url_pathname = Pathname.new(@url)
     until ext = url_pathname.extname[/[^?]+/]
       url_pathname = url_pathname.dirname
-      return if url_pathname.to_s == "."
+      return if url_pathname.to_s == "." || url_pathname.to_s == "/"
     end
     ext
   end

From 14a25bdd693236f82082c0b67058e7b2c9265c29 Mon Sep 17 00:00:00 2001
From: Sander Bol <s.bol@coolblue.nl>
Date: Wed, 7 Feb 2018 09:50:01 +0100
Subject: [PATCH 08/69] Grammar: "formula are" -> "formulae are"

Fix plural form of formula in `brew doctor` output.
---
 Library/Homebrew/diagnostic.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Library/Homebrew/diagnostic.rb b/Library/Homebrew/diagnostic.rb
index dbd6aa0c14..46750c24f4 100644
--- a/Library/Homebrew/diagnostic.rb
+++ b/Library/Homebrew/diagnostic.rb
@@ -822,7 +822,7 @@ module Homebrew
         return if linked.empty?
 
         inject_file_list linked.map(&:full_name), <<~EOS
-          Some keg-only formula are linked into the Cellar.
+          Some keg-only formulae are linked into the Cellar.
           Linking a keg-only formula, such as gettext, into the cellar with
           `brew link <formula>` will cause other formulae to detect them during
           the `./configure` step. This may cause problems when compiling those
@@ -872,7 +872,7 @@ module Homebrew
         return if missing.empty?
 
         <<~EOS
-          Some installed formula are missing dependencies.
+          Some installed formulae are missing dependencies.
           You should `brew install` the missing dependencies:
             brew install #{missing.sort_by(&:full_name) * " "}
 

From c946da88ab07772ac4becd45ef0c82a60bbfc515 Mon Sep 17 00:00:00 2001
From: Andrew Janke <andrew@apjanke.net>
Date: Sat, 10 Feb 2018 08:34:23 -0500
Subject: [PATCH 09/69] linkage_checker: Distinguish indirect deps from
 undeclared deps

---
 Library/Homebrew/os/mac/linkage_checker.rb | 36 +++++++++++++++-------
 1 file changed, 25 insertions(+), 11 deletions(-)

diff --git a/Library/Homebrew/os/mac/linkage_checker.rb b/Library/Homebrew/os/mac/linkage_checker.rb
index e1709d1b45..cf6c12f22c 100644
--- a/Library/Homebrew/os/mac/linkage_checker.rb
+++ b/Library/Homebrew/os/mac/linkage_checker.rb
@@ -14,6 +14,7 @@ class LinkageChecker
     @system_dylibs = Set.new
     @broken_dylibs = Set.new
     @variable_dylibs = Set.new
+    @indirect_deps = []
     @undeclared_deps = []
     @reverse_links = Hash.new { |h, k| h[k] = Set.new }
     @unnecessary_deps = []
@@ -52,7 +53,7 @@ class LinkageChecker
       end
     end
 
-    @undeclared_deps, @unnecessary_deps = check_undeclared_deps if formula
+    @indirect_deps, @undeclared_deps, @unnecessary_deps = check_undeclared_deps if formula
   end
 
   def check_undeclared_deps
@@ -62,13 +63,31 @@ class LinkageChecker
       formula.build.without?(dep)
     end
     declared_deps = formula.deps.reject { |dep| filter_out.call(dep) }.map(&:name)
+    recursive_deps = keg.to_formula.runtime_dependencies.map { |dep| dep.to_formula.full_name }
     declared_dep_names = declared_deps.map { |dep| dep.split("/").last }
-    undeclared_deps = @brewed_dylibs.keys.reject do |full_name|
+    indirect_deps = []
+    undeclared_deps = []
+    @brewed_dylibs.each_key do |full_name|
       name = full_name.split("/").last
-      next true if name == formula.name
-      declared_dep_names.include?(name)
+      next if name == formula.name
+      if recursive_deps.include?(name)
+        indirect_deps << full_name unless declared_dep_names.include?(name)
+      else
+        undeclared_deps << full_name
+      end
     end
-    undeclared_deps.sort do |a, b|
+    sort_by_formula_full_name!(indirect_deps)
+    sort_by_formula_full_name!(undeclared_deps)
+    unnecessary_deps = declared_dep_names.reject do |full_name|
+      name = full_name.split("/").last
+      next true if Formula[name].bin.directory?
+      @brewed_dylibs.keys.map { |x| x.split("/").last }.include?(name)
+    end
+    [indirect_deps, undeclared_deps, unnecessary_deps]
+  end
+
+  def sort_by_formula_full_name!(arr)
+    arr.sort! do |a, b|
       if a.include?("/") && !b.include?("/")
         1
       elsif !a.include?("/") && b.include?("/")
@@ -77,17 +96,12 @@ class LinkageChecker
         a <=> b
       end
     end
-    unnecessary_deps = declared_dep_names.reject do |full_name|
-      name = full_name.split("/").last
-      next true if Formula[name].bin.directory?
-      @brewed_dylibs.keys.map { |x| x.split("/").last }.include?(name)
-    end
-    [undeclared_deps, unnecessary_deps]
   end
 
   def display_normal_output
     display_items "System libraries", @system_dylibs
     display_items "Homebrew libraries", @brewed_dylibs
+    display_items "Indirect dependencies with linkage", @indirect_deps
     display_items "Variable-referenced libraries", @variable_dylibs
     display_items "Missing libraries", @broken_dylibs
     display_items "Undeclared dependencies with linkage", @undeclared_deps

From f97d8e3905f4ede7403be512df4aaeccc59147be Mon Sep 17 00:00:00 2001
From: Dominyk Tiller <dominyktiller@gmail.com>
Date: Sat, 10 Feb 2018 09:05:06 +0000
Subject: [PATCH 10/69] diagnostic: implement cache size check

---
 Library/Homebrew/diagnostic.rb | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/Library/Homebrew/diagnostic.rb b/Library/Homebrew/diagnostic.rb
index dbd6aa0c14..cc364eaaa4 100644
--- a/Library/Homebrew/diagnostic.rb
+++ b/Library/Homebrew/diagnostic.rb
@@ -835,6 +835,17 @@ module Homebrew
         EOS
       end
 
+      def check_for_large_cache
+        return unless HOMEBREW_CACHE.exist?
+        return if ENV["CI"] # CI can be expected to have a large cache.
+        cache_size = HOMEBREW_CACHE.disk_usage
+        return unless cache_size > 2_147_483_648
+        <<~EOS
+          Your HOMEBREW_CACHE is using #{disk_usage_readable(cache_size)} of disk space.
+          You may wish to consider running `brew cleanup`.
+        EOS
+      end
+
       def check_for_other_frameworks
         # Other frameworks that are known to cause problems when present
         frameworks_to_check = %w[

From 49972e59052635cf1e42fa2418f9bb4c2cf29a8a Mon Sep 17 00:00:00 2001
From: Andrew Janke <andrew@apjanke.net>
Date: Fri, 9 Feb 2018 20:57:06 -0500
Subject: [PATCH 11/69] write_jar_script: add java version option

---
 Library/Homebrew/extend/pathname.rb | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/Library/Homebrew/extend/pathname.rb b/Library/Homebrew/extend/pathname.rb
index b4311f13fa..baf47b2764 100644
--- a/Library/Homebrew/extend/pathname.rb
+++ b/Library/Homebrew/extend/pathname.rb
@@ -436,11 +436,14 @@ class Pathname
   end
 
   # Writes an exec script that invokes a java jar
-  def write_jar_script(target_jar, script_name, java_opts = "")
+  def write_jar_script(target_jar, script_name, java_opts = "", java_version: nil)
     mkpath
+    java_home = if java_version
+      "JAVA_HOME=\"$(#{Language::Java.java_home_cmd(java_version)})\" "
+    end
     join(script_name).write <<~EOS
       #!/bin/bash
-      exec java #{java_opts} -jar #{target_jar} "$@"
+      #{java_home}exec java #{java_opts} -jar #{target_jar} "$@"
     EOS
   end
 

From 51ed7983a5d77213b7e6df0e51c54c0bf9ebe350 Mon Sep 17 00:00:00 2001
From: Dominyk Tiller <dominyktiller@gmail.com>
Date: Mon, 12 Feb 2018 10:11:45 +0000
Subject: [PATCH 12/69] diagnostic: guard cache check on Jenkins too

---
 Library/Homebrew/diagnostic.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Library/Homebrew/diagnostic.rb b/Library/Homebrew/diagnostic.rb
index cc364eaaa4..8516f2b634 100644
--- a/Library/Homebrew/diagnostic.rb
+++ b/Library/Homebrew/diagnostic.rb
@@ -837,7 +837,8 @@ module Homebrew
 
       def check_for_large_cache
         return unless HOMEBREW_CACHE.exist?
-        return if ENV["CI"] # CI can be expected to have a large cache.
+        # CI can be expected to have a large cache.
+        return if ENV["CI"] || ENV["JENKINS_HOME"]
         cache_size = HOMEBREW_CACHE.disk_usage
         return unless cache_size > 2_147_483_648
         <<~EOS

From a30c74987a1b10fbc5ab7b600e8f8769a34344f7 Mon Sep 17 00:00:00 2001
From: Mike McQuaid <mike@mikemcquaid.com>
Date: Mon, 12 Feb 2018 16:38:10 +0000
Subject: [PATCH 13/69] brew, diagnostic: tweak CI variable checks.

I've adjusted test-bot in:
https://github.com/Homebrew/homebrew-test-bot/commit/603918939a58a8d6351177fe35f0193b79549dfa
to set CI=1 for Jenkins to make future JENKINS_HOME checks unnecessary.

The only `TRAVIS_*` variable we care about is `TRAVIS_SUDO` so whitelist
that specifically rather than passing through loads of others.
---
 Library/Homebrew/diagnostic.rb | 4 ++--
 bin/brew                       | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Library/Homebrew/diagnostic.rb b/Library/Homebrew/diagnostic.rb
index 8516f2b634..1787583476 100644
--- a/Library/Homebrew/diagnostic.rb
+++ b/Library/Homebrew/diagnostic.rb
@@ -788,7 +788,7 @@ module Homebrew
           EOS
         end
 
-        return if ENV["CI"] || ENV["JENKINS_HOME"]
+        return if ENV["CI"]
 
         branch = coretap_path.git_branch
         return if branch.nil? || branch =~ /master/
@@ -838,7 +838,7 @@ module Homebrew
       def check_for_large_cache
         return unless HOMEBREW_CACHE.exist?
         # CI can be expected to have a large cache.
-        return if ENV["CI"] || ENV["JENKINS_HOME"]
+        return if ENV["CI"]
         cache_size = HOMEBREW_CACHE.disk_usage
         return unless cache_size > 2_147_483_648
         <<~EOS
diff --git a/bin/brew b/bin/brew
index 881ace1ec1..34c28056b1 100755
--- a/bin/brew
+++ b/bin/brew
@@ -66,9 +66,9 @@ then
 
   FILTERED_ENV=()
   # Filter all but the specific variables.
-  for VAR in HOME SHELL PATH TERM LOGNAME USER CI TRAVIS SSH_AUTH_SOCK SUDO_ASKPASS \
+  for VAR in HOME SHELL PATH TERM LOGNAME USER CI TRAVIS TRAVIS_SUDO SSH_AUTH_SOCK SUDO_ASKPASS \
              http_proxy https_proxy ftp_proxy no_proxy all_proxy HTTPS_PROXY FTP_PROXY ALL_PROXY \
-             "${!HOMEBREW_@}" "${!TRAVIS_@}" "${!JENKINS_@}"
+             "${!HOMEBREW_@}"
   do
     # Skip if variable value is empty.
     [[ -z "${!VAR}" ]] && continue

From 473cdff132d8460012f37c28f4cf4f0241f6d01f Mon Sep 17 00:00:00 2001
From: Mike McQuaid <mike@mikemcquaid.com>
Date: Mon, 12 Feb 2018 16:54:23 +0000
Subject: [PATCH 14/69] ISSUE_TEMPLATE: various updates.

Most notably: try to point people towards Discourse for non-bugs.
---
 .github/ISSUE_TEMPLATE.md | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
index 287e95b03a..cfa55d26e6 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -1,10 +1,10 @@
 **Please note we will close your issue without comment if you delete, do not read or do not fill out the issue checklist below and provide ALL the requested information. If you repeatedly fail to use the issue template, we will block you from ever submitting issues to Homebrew again.**
 
-# Please always follow these steps:
-- [ ] Confirmed this is a problem with running a `brew` command and not `brew install`ing or the post-install behaviour of one or more formulae? If it's a formulae-specific problem please file this issue at the relevant tap e.g. for Homebrew/homebrew-core https://github.com/Homebrew/homebrew-core/issues/new
-- [ ] Ran `brew update` and retried your prior step?
-- [ ] Ran `brew doctor`, fixed all issues and retried your prior step?
-- [ ] Ran `brew config` and `brew doctor` and included their output with your issue?
+- [ ] are reporting a bug others will be able to reproduce and not asking a question. If you're not sure or want to ask a question do so on our Discourse: https://discourse.brew.sh
+- [ ] ran a `brew` command and reproduced the problem with multiple formulae? If it's a problem with a single, official formula (not cask) please file this issue at Homebrew/homebrew-core: https://github.com/Homebrew/homebrew-core/issues/new. If it's a `brew cask` problem please file this issue at https://github.com/caskroom/homebrew-cask/issues/new. If it's a tap (e.g. Homebrew/homebrew-php) problem please file this issue at the tap.
+- [ ] ran `brew update` and can still reproduce the problem?
+- [ ] ran `brew doctor`, fixed all issues and can still reproduce the problem?
+- [ ] ran `brew config` and `brew doctor` and included their output with your issue?
 
 To help us debug your issue please explain:
 - What you were trying to do (and why)
@@ -16,7 +16,7 @@ To help us debug your issue please explain:
 Please replace this section with:
 - a detailed description of your proposed feature
 - the motivation for the feature
-- how the feature would be relevant to at least 90% of Homebrew users
+- how the feature would be relevant to at least 90% of Homebrew users (if it's not: do not open a feature request)
 - what alternatives to the feature you have considered
 
-We will close this issue or ask you to create a pull-request if it's something we're not actively planning to work on.
+We will close this issue or ask you to create a pull-request if it's something the maintainers are not actively planning to work on.

From 7388acb86e0b9811e6badd610255954b3b3a6453 Mon Sep 17 00:00:00 2001
From: joshua stein <jcs@jcs.org>
Date: Mon, 12 Feb 2018 11:06:55 -0600
Subject: [PATCH 15/69] Tty: if HOMEBREW_NO_COLOR env var is present, disable
 color

bin/brew will recognize NO_COLOR variable and copy it to
HOMEBREW_NO_COLOR
---
 Library/Homebrew/manpages/brew.1.md.erb |  3 +++
 Library/Homebrew/test/cask/dsl_spec.rb  |  1 +
 Library/Homebrew/test/utils/tty_spec.rb | 14 +++++++++++++-
 Library/Homebrew/utils/tty.rb           |  4 +++-
 bin/brew                                |  2 +-
 docs/Manpage.md                         |  3 +++
 manpages/brew.1                         |  4 ++++
 7 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/Library/Homebrew/manpages/brew.1.md.erb b/Library/Homebrew/manpages/brew.1.md.erb
index 508c90f2d4..fbe6fca946 100644
--- a/Library/Homebrew/manpages/brew.1.md.erb
+++ b/Library/Homebrew/manpages/brew.1.md.erb
@@ -199,6 +199,9 @@ can take several different forms:
     If set, Homebrew will not auto-update before running `brew install`,
     `brew upgrade` or `brew tap`.
 
+  * `HOMEBREW_NO_COLOR`:
+    If set, Homebrew will not print text with color added.
+
   * `HOMEBREW_NO_EMOJI`:
     If set, Homebrew will not print the `HOMEBREW_INSTALL_BADGE` on a
     successful build.
diff --git a/Library/Homebrew/test/cask/dsl_spec.rb b/Library/Homebrew/test/cask/dsl_spec.rb
index d3bb462642..993c03bac8 100644
--- a/Library/Homebrew/test/cask/dsl_spec.rb
+++ b/Library/Homebrew/test/cask/dsl_spec.rb
@@ -75,6 +75,7 @@ describe Hbc::DSL, :cask do
 
       it "may use deprecated DSL version hash syntax" do
         allow(ENV).to receive(:[]).with("HOMEBREW_DEVELOPER").and_return(nil)
+        allow(ENV).to receive(:[]).with("HOMEBREW_NO_COLOR").and_return(nil)
 
         expect(cask.token).to eq("with-dsl-version")
         expect(cask.url.to_s).to eq("http://example.com/TestCask.dmg")
diff --git a/Library/Homebrew/test/utils/tty_spec.rb b/Library/Homebrew/test/utils/tty_spec.rb
index 3ba89b6fdb..e6c9168f31 100644
--- a/Library/Homebrew/test/utils/tty_spec.rb
+++ b/Library/Homebrew/test/utils/tty_spec.rb
@@ -53,7 +53,7 @@ describe Tty do
       allow($stdout).to receive(:tty?).and_return(true)
     end
 
-    it "returns an empty string for all colors" do
+    it "returns ANSI escape codes for colors" do
       expect(subject.to_s).to eq("")
       expect(subject.red.to_s).to eq("\033[31m")
       expect(subject.green.to_s).to eq("\033[32m")
@@ -63,5 +63,17 @@ describe Tty do
       expect(subject.cyan.to_s).to eq("\033[36m")
       expect(subject.default.to_s).to eq("\033[39m")
     end
+
+    it "returns an empty string for all colors when HOMEBREW_NO_COLOR is set" do
+      ENV["HOMEBREW_NO_COLOR"] = "1"
+      expect(subject.to_s).to eq("")
+      expect(subject.red.to_s).to eq("")
+      expect(subject.green.to_s).to eq("")
+      expect(subject.yellow.to_s).to eq("")
+      expect(subject.blue.to_s).to eq("")
+      expect(subject.magenta.to_s).to eq("")
+      expect(subject.cyan.to_s).to eq("")
+      expect(subject.default.to_s).to eq("")
+    end
   end
 end
diff --git a/Library/Homebrew/utils/tty.rb b/Library/Homebrew/utils/tty.rb
index e872e64601..81d5f00d7b 100644
--- a/Library/Homebrew/utils/tty.rb
+++ b/Library/Homebrew/utils/tty.rb
@@ -59,7 +59,9 @@ module Tty
   end
 
   def to_s
-    return "" unless $stdout.tty?
+    if ENV["HOMEBREW_NO_COLOR"] || !$stdout.tty?
+      return ""
+    end
     current_escape_sequence
   ensure
     reset_escape_sequence!
diff --git a/bin/brew b/bin/brew
index 881ace1ec1..946e836370 100755
--- a/bin/brew
+++ b/bin/brew
@@ -47,7 +47,7 @@ HOMEBREW_LIBRARY="$HOMEBREW_REPOSITORY/Library"
 # Whitelist and copy to HOMEBREW_* all variables previously mentioned in
 # manpage or used elsewhere by Homebrew.
 for VAR in AWS_ACCESS_KEY_ID AWS_SECRET_ACCESS_KEY BINTRAY_USER BINTRAY_KEY \
-           BROWSER EDITOR GIT PATH VISUAL \
+           BROWSER EDITOR GIT NO_COLOR PATH VISUAL \
            GITHUB_USER GITHUB_PASSWORD GITHUB_TOKEN
 do
   # Skip if variable value is empty.
diff --git a/docs/Manpage.md b/docs/Manpage.md
index 9205183767..e4f189490b 100644
--- a/docs/Manpage.md
+++ b/docs/Manpage.md
@@ -1037,6 +1037,9 @@ can take several different forms:
     If set, Homebrew will not auto-update before running `brew install`,
     `brew upgrade` or `brew tap`.
 
+  * `HOMEBREW_NO_COLOR`:
+    If set, Homebrew will not print text with color added.
+
   * `HOMEBREW_NO_EMOJI`:
     If set, Homebrew will not print the `HOMEBREW_INSTALL_BADGE` on a
     successful build.
diff --git a/manpages/brew.1 b/manpages/brew.1
index 56581bfc0f..4f373558c6 100644
--- a/manpages/brew.1
+++ b/manpages/brew.1
@@ -1059,6 +1059,10 @@ If set, Homebrew will not send analytics\. See: \fIhttps://docs\.brew\.sh/Analyt
 If set, Homebrew will not auto\-update before running \fBbrew install\fR, \fBbrew upgrade\fR or \fBbrew tap\fR\.
 .
 .TP
+\fBHOMEBREW_NO_COLOR\fR
+If set, Homebrew will not print text with color added\.
+.
+.TP
 \fBHOMEBREW_NO_EMOJI\fR
 If set, Homebrew will not print the \fBHOMEBREW_INSTALL_BADGE\fR on a successful build\.
 .

From ca3fccaf2b4bfe5c4d96a17ac5559f3721d00230 Mon Sep 17 00:00:00 2001
From: Kevin Abel <kevin.abel.0@gmail.com>
Date: Mon, 12 Feb 2018 14:22:10 -0600
Subject: [PATCH 16/69] Make ext use bounded iterator

---
 Library/Homebrew/download_strategy.rb | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/Library/Homebrew/download_strategy.rb b/Library/Homebrew/download_strategy.rb
index ed316fa7fb..e85661d76d 100644
--- a/Library/Homebrew/download_strategy.rb
+++ b/Library/Homebrew/download_strategy.rb
@@ -303,12 +303,11 @@ class AbstractFileDownloadStrategy < AbstractDownloadStrategy
     # We can't use basename_without_params, because given a URL like
     #   https://example.com/download.php?file=foo-1.0.tar.gz
     # the extension we want is ".tar.gz", not ".php".
-    url_pathname = Pathname.new(@url)
-    until ext = url_pathname.extname[/[^?]+/]
-      url_pathname = url_pathname.dirname
-      return if url_pathname.to_s == "." || url_pathname.to_s == "/"
+    Pathname.new(@url).ascend do |path|
+      ext = path.extname[/[^?]+/]
+      return ext if ext
     end
-    ext
+    nil
   end
 end
 

From c57ab279ba4c723c275864e4f99c55a1cbc62a67 Mon Sep 17 00:00:00 2001
From: Mike McQuaid <mike@mikemcquaid.com>
Date: Tue, 13 Feb 2018 09:34:19 +0000
Subject: [PATCH 17/69] Use rspec-retry in flaky brew tests.

We have a few tests that are intermittently flaky. Let's try this to see
if we can get them a bit more reliable.
---
 Library/Homebrew/test/Gemfile              | 1 +
 Library/Homebrew/test/Gemfile.lock         | 5 ++++-
 Library/Homebrew/test/cmd/search_spec.rb   | 2 +-
 Library/Homebrew/test/cmd/services_spec.rb | 2 +-
 Library/Homebrew/test/dev-cmd/pull_spec.rb | 2 +-
 Library/Homebrew/test/spec_helper.rb       | 1 +
 6 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/Library/Homebrew/test/Gemfile b/Library/Homebrew/test/Gemfile
index b6d1405ff6..34ba794a89 100644
--- a/Library/Homebrew/test/Gemfile
+++ b/Library/Homebrew/test/Gemfile
@@ -5,6 +5,7 @@ require_relative "../constants"
 gem "parallel_tests"
 gem "rspec"
 gem "rspec-its", require: false
+gem "rspec-retry", require: false
 gem "rspec-wait", require: false
 gem "rubocop", HOMEBREW_RUBOCOP_VERSION
 
diff --git a/Library/Homebrew/test/Gemfile.lock b/Library/Homebrew/test/Gemfile.lock
index 47f51e56bb..a3f9c4c47e 100644
--- a/Library/Homebrew/test/Gemfile.lock
+++ b/Library/Homebrew/test/Gemfile.lock
@@ -31,6 +31,8 @@ GEM
     rspec-mocks (3.6.0)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.6.0)
+    rspec-retry (0.5.6)
+      rspec-core (> 3.3, < 3.8)
     rspec-support (3.6.0)
     rspec-wait (0.0.9)
       rspec (>= 3, < 4)
@@ -58,9 +60,10 @@ DEPENDENCIES
   parallel_tests
   rspec
   rspec-its
+  rspec-retry
   rspec-wait
   rubocop (= 0.52.1)
   simplecov
 
 BUNDLED WITH
-   1.16.0
+   1.16.1
diff --git a/Library/Homebrew/test/cmd/search_spec.rb b/Library/Homebrew/test/cmd/search_spec.rb
index 36ddde3e1d..aec23ae4c1 100644
--- a/Library/Homebrew/test/cmd/search_spec.rb
+++ b/Library/Homebrew/test/cmd/search_spec.rb
@@ -25,7 +25,7 @@ describe "brew search", :integration_test do
       .and be_a_success
   end
 
-  it "falls back to a GitHub tap search when no formula is found", :needs_network do
+  it "falls back to a GitHub tap search when no formula is found", :needs_network, retry: 3 do
     expect { brew "search", "caskroom/cask/firefox" }
       .to output(/firefox/).to_stdout
       .and output(/Searching/).to_stderr
diff --git a/Library/Homebrew/test/cmd/services_spec.rb b/Library/Homebrew/test/cmd/services_spec.rb
index 669e84e5f8..fb40ce0b21 100644
--- a/Library/Homebrew/test/cmd/services_spec.rb
+++ b/Library/Homebrew/test/cmd/services_spec.rb
@@ -1,4 +1,4 @@
-describe "brew services", :integration_test, :needs_macos, :needs_network do
+describe "brew services", :integration_test, :needs_macos, :needs_network, retry: 3 do
   it "allows controlling services" do
     setup_remote_tap "homebrew/services"
 
diff --git a/Library/Homebrew/test/dev-cmd/pull_spec.rb b/Library/Homebrew/test/dev-cmd/pull_spec.rb
index 984ac08439..cc66df7830 100644
--- a/Library/Homebrew/test/dev-cmd/pull_spec.rb
+++ b/Library/Homebrew/test/dev-cmd/pull_spec.rb
@@ -6,7 +6,7 @@ describe "brew pull", :integration_test do
       .and be_a_failure
   end
 
-  it "fetches a patch from a GitHub commit or pull request and applies it", :needs_network do
+  it "fetches a patch from a GitHub commit or pull request and applies it", :needs_network, retry: 3 do
     CoreTap.instance.path.cd do
       system "git", "init"
       system "git", "checkout", "-b", "new-branch"
diff --git a/Library/Homebrew/test/spec_helper.rb b/Library/Homebrew/test/spec_helper.rb
index be184b6e09..865342ddfc 100644
--- a/Library/Homebrew/test/spec_helper.rb
+++ b/Library/Homebrew/test/spec_helper.rb
@@ -2,6 +2,7 @@ require "find"
 require "pathname"
 require "rspec/its"
 require "rspec/wait"
+require "rspec/retry"
 require "rubocop"
 require "rubocop/rspec/support"
 require "set"

From 0efe63402b661752601faaf4450d428ca60f54c8 Mon Sep 17 00:00:00 2001
From: ilovezfs <ilovezfs@icloud.com>
Date: Tue, 13 Feb 2018 01:57:20 -0800
Subject: [PATCH 18/69] diagnostic: remove cache size check

---
 Library/Homebrew/diagnostic.rb | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/Library/Homebrew/diagnostic.rb b/Library/Homebrew/diagnostic.rb
index 1787583476..d1de5ab00b 100644
--- a/Library/Homebrew/diagnostic.rb
+++ b/Library/Homebrew/diagnostic.rb
@@ -835,18 +835,6 @@ module Homebrew
         EOS
       end
 
-      def check_for_large_cache
-        return unless HOMEBREW_CACHE.exist?
-        # CI can be expected to have a large cache.
-        return if ENV["CI"]
-        cache_size = HOMEBREW_CACHE.disk_usage
-        return unless cache_size > 2_147_483_648
-        <<~EOS
-          Your HOMEBREW_CACHE is using #{disk_usage_readable(cache_size)} of disk space.
-          You may wish to consider running `brew cleanup`.
-        EOS
-      end
-
       def check_for_other_frameworks
         # Other frameworks that are known to cause problems when present
         frameworks_to_check = %w[

From 8d458fa443f039b646e71a17aa5fa60c96d24454 Mon Sep 17 00:00:00 2001
From: commitay <commitay@users.noreply.github.com>
Date: Tue, 13 Feb 2018 21:03:06 +1000
Subject: [PATCH 19/69] cask doctor: check_cached_downloads

---
 Library/Homebrew/cask/lib/hbc/cli/doctor.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Library/Homebrew/cask/lib/hbc/cli/doctor.rb b/Library/Homebrew/cask/lib/hbc/cli/doctor.rb
index a586a00ab1..32b927218b 100644
--- a/Library/Homebrew/cask/lib/hbc/cli/doctor.rb
+++ b/Library/Homebrew/cask/lib/hbc/cli/doctor.rb
@@ -24,6 +24,7 @@ module Hbc
         check_software_versions
         check_install_location
         check_staging_location
+        check_cached_downloads
         check_taps
         check_load_path
         check_environment_variables

From 191b6218152f64da6e165e9a8947322388a7fdfb Mon Sep 17 00:00:00 2001
From: Markus Reiter <me@reitermark.us>
Date: Tue, 13 Feb 2018 17:23:49 +0100
Subject: [PATCH 20/69] Make sure `.metadata` shows up in Cask backtrace.

---
 Library/Homebrew/cask/lib/hbc/cask_loader.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Library/Homebrew/cask/lib/hbc/cask_loader.rb b/Library/Homebrew/cask/lib/hbc/cask_loader.rb
index c32b355847..74c39176d3 100644
--- a/Library/Homebrew/cask/lib/hbc/cask_loader.rb
+++ b/Library/Homebrew/cask/lib/hbc/cask_loader.rb
@@ -16,11 +16,11 @@ module Hbc
       end
 
       def initialize(content)
-        @content = content
+        @content = content.force_encoding("UTF-8")
       end
 
       def load
-        instance_eval(content.force_encoding("UTF-8"), __FILE__, __LINE__)
+        instance_eval(content, __FILE__, __LINE__)
       end
 
       private
@@ -52,7 +52,7 @@ module Hbc
 
         @content = IO.read(path)
 
-        super
+        instance_eval(content, path)
       end
 
       private

From cf4c2bb97adbde2ff8796e4363572f7f6fdaa8a5 Mon Sep 17 00:00:00 2001
From: Markus Reiter <me@reitermark.us>
Date: Tue, 13 Feb 2018 18:01:25 +0100
Subject: [PATCH 21/69] Auto-update on `brew cask install/upgrade`.

---
 Library/Homebrew/brew.sh | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/Library/Homebrew/brew.sh b/Library/Homebrew/brew.sh
index 60952c7fed..47064c61b9 100644
--- a/Library/Homebrew/brew.sh
+++ b/Library/Homebrew/brew.sh
@@ -224,6 +224,15 @@ case "$HOMEBREW_COMMAND" in
   --config)    HOMEBREW_COMMAND="config" ;;
 esac
 
+if [[ "$HOMEBREW_COMMAND" = "cask" ]]
+then
+  HOMEBREW_CASK_COMMAND="$1"
+
+  case "$HOMEBREW_CASK_COMMAND" in
+    instal) HOMEBREW_CASK_COMMAND="install" ;; # gem does the same
+  esac
+fi
+
 # Set HOMEBREW_DEV_CMD_RUN for users who have run a development command.
 # This makes them behave like HOMEBREW_DEVELOPERs for brew update.
 if [[ -z "$HOMEBREW_DEVELOPER" ]]
@@ -297,7 +306,8 @@ update-preinstall() {
   [[ -z "$HOMEBREW_AUTO_UPDATE_CHECKED" ]] || return
   [[ -z "$HOMEBREW_UPDATE_PREINSTALL" ]] || return
 
-  if [[ "$HOMEBREW_COMMAND" = "install" || "$HOMEBREW_COMMAND" = "upgrade" || "$HOMEBREW_COMMAND" = "tap" ]]
+  if [[ "$HOMEBREW_COMMAND" = "install" || "$HOMEBREW_COMMAND" = "upgrade" || "$HOMEBREW_COMMAND" = "tap" ||
+        "$HOMEBREW_CASK_COMMAND" = "install" || "$HOMEBREW_CASK_COMMAND" = "upgrade" ]]
   then
     if [[ -z "$HOMEBREW_VERBOSE" ]]
     then

From 102a2a491b12db20d5096418bb559e25c864f20a Mon Sep 17 00:00:00 2001
From: Markus Reiter <me@reitermark.us>
Date: Tue, 13 Feb 2018 18:49:01 +0100
Subject: [PATCH 22/69] =?UTF-8?q?Add=20Homebrew=E2=80=99s=20`bin`=20to=20P?=
 =?UTF-8?q?ATH=20for=20Cask=20installers.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Library/Homebrew/cask/lib/hbc/artifact/installer.rb |  2 +-
 Library/Homebrew/cask/lib/hbc/system_command.rb     | 11 ++++-------
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/Library/Homebrew/cask/lib/hbc/artifact/installer.rb b/Library/Homebrew/cask/lib/hbc/artifact/installer.rb
index 5cd388c7fe..8fa54c01ec 100644
--- a/Library/Homebrew/cask/lib/hbc/artifact/installer.rb
+++ b/Library/Homebrew/cask/lib/hbc/artifact/installer.rb
@@ -23,7 +23,7 @@ module Hbc
         def install_phase(command: nil, **_)
           ohai "Running #{self.class.dsl_key} script '#{path.relative_path_from(cask.staged_path)}'"
           FileUtils.chmod "+x", path unless path.executable?
-          command.run(path, **args)
+          command.run(path, **args, path: PATH.new(HOMEBREW_PREFIX/"bin", HOMEBREW_PREFIX/"sbin", ENV["PATH"]))
         end
       end
 
diff --git a/Library/Homebrew/cask/lib/hbc/system_command.rb b/Library/Homebrew/cask/lib/hbc/system_command.rb
index a890c42e41..dfb3019998 100644
--- a/Library/Homebrew/cask/lib/hbc/system_command.rb
+++ b/Library/Homebrew/cask/lib/hbc/system_command.rb
@@ -37,7 +37,7 @@ module Hbc
       result
     end
 
-    def initialize(executable, args: [], sudo: false, input: [], print_stdout: false, print_stderr: true, must_succeed: false, **options)
+    def initialize(executable, args: [], sudo: false, input: [], print_stdout: false, print_stderr: true, must_succeed: false, path: ENV["PATH"], **options)
       @executable = executable
       @args = args
       @sudo = sudo
@@ -47,6 +47,7 @@ module Hbc
       @must_succeed = must_succeed
       options.extend(HashValidator).assert_valid_keys(:chdir)
       @options = options
+      @path = path
     end
 
     def command
@@ -55,7 +56,7 @@ module Hbc
 
     private
 
-    attr_reader :executable, :args, :input, :options, :processed_output, :processed_status
+    attr_reader :executable, :args, :input, :options, :processed_output, :processed_status, :path
 
     attr_predicate :sudo?, :print_stdout?, :print_stderr?, :must_succeed?
 
@@ -83,12 +84,8 @@ module Hbc
     def each_output_line(&b)
       executable, *args = expanded_command
 
-      unless File.exist?(executable)
-        executable = which(executable, PATH.new(ENV["PATH"], HOMEBREW_PREFIX/"bin"))
-      end
-
       raw_stdin, raw_stdout, raw_stderr, raw_wait_thr =
-        Open3.popen3([executable, executable], *args, **options)
+        Open3.popen3({ "PATH" => path }, executable, *args, **options)
 
       write_input_to(raw_stdin)
       raw_stdin.close_write

From e078becf4f3b7beaedea35e664a8c3562331ab3e Mon Sep 17 00:00:00 2001
From: commitay <commitay@users.noreply.github.com>
Date: Sun, 21 Jan 2018 19:10:30 +1000
Subject: [PATCH 23/69] cask move_back: copy / delete

---
 Library/Homebrew/cask/lib/hbc/artifact/moved.rb  | 8 +++++---
 Library/Homebrew/test/cask/cli/reinstall_spec.rb | 3 ++-
 Library/Homebrew/test/cask/cli/uninstall_spec.rb | 3 ++-
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/Library/Homebrew/cask/lib/hbc/artifact/moved.rb b/Library/Homebrew/cask/lib/hbc/artifact/moved.rb
index 856ab2766f..5a7483543e 100644
--- a/Library/Homebrew/cask/lib/hbc/artifact/moved.rb
+++ b/Library/Homebrew/cask/lib/hbc/artifact/moved.rb
@@ -62,14 +62,16 @@ module Hbc
           raise CaskError, "It seems the #{self.class.english_name} source '#{target}' is not there."
         end
 
-        ohai "Moving #{self.class.english_name} '#{target.basename}' back to '#{source}'."
+        ohai "Copying #{self.class.english_name} '#{target.basename}' back to '#{source}'."
         source.dirname.mkpath
 
         if target.parent.writable?
-          FileUtils.move(target, source)
+          FileUtils.cp_r(target, source)
         else
-          command.run("/bin/mv", args: [target, source], sudo: true)
+          command.run("/bin/cp", args: ["-r", target, source], sudo: true)
         end
+
+        delete(target, force: force, command: command, **options)
       end
 
       def delete(target, force: false, command: nil, **_)
diff --git a/Library/Homebrew/test/cask/cli/reinstall_spec.rb b/Library/Homebrew/test/cask/cli/reinstall_spec.rb
index 3737a7a701..f56ed986d1 100644
--- a/Library/Homebrew/test/cask/cli/reinstall_spec.rb
+++ b/Library/Homebrew/test/cask/cli/reinstall_spec.rb
@@ -13,7 +13,8 @@ describe Hbc::CLI::Reinstall, :cask do
       Already downloaded: .*local-caffeine--1.2.3.zip
       ==> Verifying checksum for Cask local-caffeine
       ==> Uninstalling Cask local-caffeine
-      ==> Moving App 'Caffeine.app' back to '.*Caffeine.app'.
+      ==> Copying App 'Caffeine.app' back to '.*Caffeine.app'.
+      ==> Removing App '.*Caffeine.app'.
       ==> Purging files for version 1.2.3 of Cask local-caffeine
       ==> Installing Cask local-caffeine
       ==> Moving App 'Caffeine.app' to '.*Caffeine.app'.
diff --git a/Library/Homebrew/test/cask/cli/uninstall_spec.rb b/Library/Homebrew/test/cask/cli/uninstall_spec.rb
index 322394de4c..2cac42211a 100644
--- a/Library/Homebrew/test/cask/cli/uninstall_spec.rb
+++ b/Library/Homebrew/test/cask/cli/uninstall_spec.rb
@@ -12,7 +12,8 @@ describe Hbc::CLI::Uninstall, :cask do
 
     output = Regexp.new <<~EOS
       ==> Uninstalling Cask local-caffeine
-      ==> Moving App 'Caffeine.app' back to '.*Caffeine.app'.
+      ==> Copying App 'Caffeine.app' back to '.*Caffeine.app'.
+      ==> Removing App '.*Caffeine.app'.
       ==> Purging files for version 1.2.3 of Cask local-caffeine
     EOS
 

From b864ae7b408741338f0016d686857fc0fe545fe2 Mon Sep 17 00:00:00 2001
From: commitay <commitay@users.noreply.github.com>
Date: Wed, 14 Feb 2018 07:56:59 +1000
Subject: [PATCH 24/69] backing up

---
 Library/Homebrew/cask/lib/hbc/artifact/moved.rb  | 2 +-
 Library/Homebrew/test/cask/cli/reinstall_spec.rb | 2 +-
 Library/Homebrew/test/cask/cli/uninstall_spec.rb | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Library/Homebrew/cask/lib/hbc/artifact/moved.rb b/Library/Homebrew/cask/lib/hbc/artifact/moved.rb
index 5a7483543e..31cede71a9 100644
--- a/Library/Homebrew/cask/lib/hbc/artifact/moved.rb
+++ b/Library/Homebrew/cask/lib/hbc/artifact/moved.rb
@@ -62,7 +62,7 @@ module Hbc
           raise CaskError, "It seems the #{self.class.english_name} source '#{target}' is not there."
         end
 
-        ohai "Copying #{self.class.english_name} '#{target.basename}' back to '#{source}'."
+        ohai "Backing #{self.class.english_name} '#{target.basename}' up to '#{source}'."
         source.dirname.mkpath
 
         if target.parent.writable?
diff --git a/Library/Homebrew/test/cask/cli/reinstall_spec.rb b/Library/Homebrew/test/cask/cli/reinstall_spec.rb
index f56ed986d1..f2d1322ad5 100644
--- a/Library/Homebrew/test/cask/cli/reinstall_spec.rb
+++ b/Library/Homebrew/test/cask/cli/reinstall_spec.rb
@@ -13,7 +13,7 @@ describe Hbc::CLI::Reinstall, :cask do
       Already downloaded: .*local-caffeine--1.2.3.zip
       ==> Verifying checksum for Cask local-caffeine
       ==> Uninstalling Cask local-caffeine
-      ==> Copying App 'Caffeine.app' back to '.*Caffeine.app'.
+      ==> Backing App 'Caffeine.app' up to '.*Caffeine.app'.
       ==> Removing App '.*Caffeine.app'.
       ==> Purging files for version 1.2.3 of Cask local-caffeine
       ==> Installing Cask local-caffeine
diff --git a/Library/Homebrew/test/cask/cli/uninstall_spec.rb b/Library/Homebrew/test/cask/cli/uninstall_spec.rb
index 2cac42211a..38ee1bb73a 100644
--- a/Library/Homebrew/test/cask/cli/uninstall_spec.rb
+++ b/Library/Homebrew/test/cask/cli/uninstall_spec.rb
@@ -12,7 +12,7 @@ describe Hbc::CLI::Uninstall, :cask do
 
     output = Regexp.new <<~EOS
       ==> Uninstalling Cask local-caffeine
-      ==> Copying App 'Caffeine.app' back to '.*Caffeine.app'.
+      ==> Backing App 'Caffeine.app' up to '.*Caffeine.app'.
       ==> Removing App '.*Caffeine.app'.
       ==> Purging files for version 1.2.3 of Cask local-caffeine
     EOS

From 88b1e9223672ac2c23faf31055211a9a129eb692 Mon Sep 17 00:00:00 2001
From: ilovezfs <ilovezfs@icloud.com>
Date: Wed, 14 Feb 2018 03:38:38 -0800
Subject: [PATCH 25/69] formula_installer: also run audit_installed for
 keg_only formulae

---
 Library/Homebrew/formula_installer.rb | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/Library/Homebrew/formula_installer.rb b/Library/Homebrew/formula_installer.rb
index a89da9ae9e..8d7f0aae1c 100644
--- a/Library/Homebrew/formula_installer.rb
+++ b/Library/Homebrew/formula_installer.rb
@@ -566,7 +566,7 @@ class FormulaInstaller
   def caveats
     return if only_deps?
 
-    audit_installed if ARGV.homebrew_developer? && !formula.keg_only?
+    audit_installed if ARGV.homebrew_developer?
 
     caveats = Caveats.new(formula)
 
@@ -882,8 +882,10 @@ class FormulaInstaller
   end
 
   def audit_installed
-    problem_if_output(check_env_path(formula.bin))
-    problem_if_output(check_env_path(formula.sbin))
+    unless formula.keg_only?
+      problem_if_output(check_env_path(formula.bin))
+      problem_if_output(check_env_path(formula.sbin))
+    end
     super
   end
 

From e5f4160d3e7ca58f2d5f9d599246e051a32cbec4 Mon Sep 17 00:00:00 2001
From: Maxim Belkin <maxim.belkin@gmail.com>
Date: Thu, 15 Feb 2018 11:43:20 -0600
Subject: [PATCH 26/69] brew.sh: changes from Linuxbrew (Linux fork)

These fixes do two things:

- set HOMEBREW_MACOS_VERSION to 0 on non-HOMEBREW_MACOS machines
- set HOMEBREW_CURL to Homebrew'd curl
---
 Library/Homebrew/brew.sh | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/Library/Homebrew/brew.sh b/Library/Homebrew/brew.sh
index 47064c61b9..505cbeb4ca 100644
--- a/Library/Homebrew/brew.sh
+++ b/Library/Homebrew/brew.sh
@@ -111,10 +111,16 @@ then
 else
   HOMEBREW_PROCESSOR="$(uname -m)"
   HOMEBREW_PRODUCT="${HOMEBREW_SYSTEM}brew"
+  HOMEBREW_MACOS_VERSION=0
   [[ -n "$HOMEBREW_LINUX" ]] && HOMEBREW_OS_VERSION="$(lsb_release -sd 2>/dev/null)"
   : "${HOMEBREW_OS_VERSION:=$(uname -r)}"
   HOMEBREW_OS_USER_AGENT_VERSION="$HOMEBREW_OS_VERSION"
 
+  if [[ -x "$HOMEBREW_PREFIX/opt/curl/bin/curl" ]]
+  then
+    HOMEBREW_CURL="$HOMEBREW_PREFIX/opt/curl/bin/curl"
+  fi
+
   if [[ -z "$HOMEBREW_CACHE" ]]
   then
     if [[ -n "$XDG_CACHE_HOME" ]]

From e47c364c55be42462ccaacfc9bebbfd2101525b2 Mon Sep 17 00:00:00 2001
From: Maxim Belkin <maxim.belkin@gmail.com>
Date: Thu, 15 Feb 2018 13:09:47 -0600
Subject: [PATCH 27/69] Don't set HOMEBREW_MACOS_VERSION on non-mac systems

---
 Library/Homebrew/brew.sh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Library/Homebrew/brew.sh b/Library/Homebrew/brew.sh
index 505cbeb4ca..d646ebfd34 100644
--- a/Library/Homebrew/brew.sh
+++ b/Library/Homebrew/brew.sh
@@ -111,7 +111,6 @@ then
 else
   HOMEBREW_PROCESSOR="$(uname -m)"
   HOMEBREW_PRODUCT="${HOMEBREW_SYSTEM}brew"
-  HOMEBREW_MACOS_VERSION=0
   [[ -n "$HOMEBREW_LINUX" ]] && HOMEBREW_OS_VERSION="$(lsb_release -sd 2>/dev/null)"
   : "${HOMEBREW_OS_VERSION:=$(uname -r)}"
   HOMEBREW_OS_USER_AGENT_VERSION="$HOMEBREW_OS_VERSION"

From 30d468978fb0d299f3faa4461c15e82102e0d3a5 Mon Sep 17 00:00:00 2001
From: Maxim Belkin <maxim.belkin@gmail.com>
Date: Thu, 15 Feb 2018 13:26:17 -0600
Subject: [PATCH 28/69] Unifying Linux/Mac logic that sets HOMEBREW_CURL

---
 Library/Homebrew/brew.sh | 21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/Library/Homebrew/brew.sh b/Library/Homebrew/brew.sh
index d646ebfd34..a9074a6438 100644
--- a/Library/Homebrew/brew.sh
+++ b/Library/Homebrew/brew.sh
@@ -97,13 +97,6 @@ then
     HOMEBREW_FORCE_BREWED_CURL="1"
   fi
 
-  if [[ -n "$HOMEBREW_FORCE_BREWED_CURL" &&
-        -x "$HOMEBREW_PREFIX/opt/curl/bin/curl" ]] &&
-           "$HOMEBREW_PREFIX/opt/curl/bin/curl" --version >/dev/null
-  then
-    HOMEBREW_CURL="$HOMEBREW_PREFIX/opt/curl/bin/curl"
-  fi
-
   if [[ -z "$HOMEBREW_CACHE" ]]
   then
     HOMEBREW_CACHE="$HOME/Library/Caches/Homebrew"
@@ -114,11 +107,7 @@ else
   [[ -n "$HOMEBREW_LINUX" ]] && HOMEBREW_OS_VERSION="$(lsb_release -sd 2>/dev/null)"
   : "${HOMEBREW_OS_VERSION:=$(uname -r)}"
   HOMEBREW_OS_USER_AGENT_VERSION="$HOMEBREW_OS_VERSION"
-
-  if [[ -x "$HOMEBREW_PREFIX/opt/curl/bin/curl" ]]
-  then
-    HOMEBREW_CURL="$HOMEBREW_PREFIX/opt/curl/bin/curl"
-  fi
+  HOMEBREW_FORCE_BREWED_CURL=1
 
   if [[ -z "$HOMEBREW_CACHE" ]]
   then
@@ -130,6 +119,14 @@ else
     fi
   fi
 fi
+
+if [[ -n "$HOMEBREW_FORCE_BREWED_CURL" &&
+      -x "$HOMEBREW_PREFIX/opt/curl/bin/curl" ]] &&
+         "$HOMEBREW_PREFIX/opt/curl/bin/curl" --version >/dev/null
+then
+  HOMEBREW_CURL="$HOMEBREW_PREFIX/opt/curl/bin/curl"
+fi
+
 HOMEBREW_USER_AGENT="$HOMEBREW_PRODUCT/$HOMEBREW_USER_AGENT_VERSION ($HOMEBREW_SYSTEM; $HOMEBREW_PROCESSOR $HOMEBREW_OS_USER_AGENT_VERSION)"
 HOMEBREW_CURL_VERSION="$("$HOMEBREW_CURL" --version 2>/dev/null | head -n1 | awk '{print $1"/"$2}')"
 HOMEBREW_USER_AGENT_CURL="$HOMEBREW_USER_AGENT $HOMEBREW_CURL_VERSION"

From d70d91cf2aa5223655b0c66baa61f06040663847 Mon Sep 17 00:00:00 2001
From: Shaun Jackman <sjackman@gmail.com>
Date: Mon, 5 Feb 2018 18:36:26 -0800
Subject: [PATCH 29/69] test/utils/svn: Requires svn to succeed

---
 Library/Homebrew/test/spec_helper.rb    | 4 ++++
 Library/Homebrew/test/utils/svn_spec.rb | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/Library/Homebrew/test/spec_helper.rb b/Library/Homebrew/test/spec_helper.rb
index 865342ddfc..cba530736a 100644
--- a/Library/Homebrew/test/spec_helper.rb
+++ b/Library/Homebrew/test/spec_helper.rb
@@ -75,6 +75,10 @@ RSpec.configure do |config|
     skip "Requires network connection." unless ENV["HOMEBREW_TEST_ONLINE"]
   end
 
+  config.before(:each, :needs_svn) do
+    skip "Requires subversion." unless which "svn"
+  end
+
   config.around(:each) do |example|
     def find_files
       Find.find(TEST_TMPDIR)
diff --git a/Library/Homebrew/test/utils/svn_spec.rb b/Library/Homebrew/test/utils/svn_spec.rb
index 503d285f3e..f527a614f2 100644
--- a/Library/Homebrew/test/utils/svn_spec.rb
+++ b/Library/Homebrew/test/utils/svn_spec.rb
@@ -30,7 +30,7 @@ describe Utils do
         expect(described_class.svn_remote_exists(HOMEBREW_CACHE/"install")).to be_falsey
       end
 
-      it "returns true when remote exists", :needs_network do
+      it "returns true when remote exists", :needs_network, :needs_svn do
         remote = "http://github.com/Homebrew/install"
         svn = HOMEBREW_SHIMS_PATH/"scm/svn"
 

From 444b292df9d60b355895c9b024522d01b9e30771 Mon Sep 17 00:00:00 2001
From: Maxim Belkin <maxim.belkin@gmail.com>
Date: Fri, 16 Feb 2018 10:41:14 -0600
Subject: [PATCH 30/69] zip and bzip2 dependencies when needed

On some systems identified as Linux, zip and bzip2 might
not be available. Therefore, on such platforms we add them
unconditionally as dependencies when required. On Mac, these
dependencies are always satisfied.
---
 Library/Homebrew/dependency_collector.rb      | 10 +++++++
 .../extend/os/dependency_collector.rb         |  1 +
 .../extend/os/linux/dependency_collector.rb   | 27 +++++++++++++++++++
 .../extend/os/mac/dependency_collector.rb     |  5 ++++
 4 files changed, 43 insertions(+)
 create mode 100644 Library/Homebrew/extend/os/linux/dependency_collector.rb

diff --git a/Library/Homebrew/dependency_collector.rb b/Library/Homebrew/dependency_collector.rb
index 03a86d661e..9e6d6ab0b9 100644
--- a/Library/Homebrew/dependency_collector.rb
+++ b/Library/Homebrew/dependency_collector.rb
@@ -72,6 +72,14 @@ class DependencyCollector
 
   def ld64_dep_if_needed(*); end
 
+  def zip_dep_if_needed(tags)
+    return
+  end
+
+  def bzip2_dep_if_needed(tags)
+    return
+  end
+
   def self.tar_needs_xz_dependency?
     !new.xz_dep_if_needed([]).nil?
   end
@@ -162,6 +170,8 @@ class DependencyCollector
     when ".lz"          then Dependency.new("lzip", tags)
     when ".rar"         then Dependency.new("unrar", tags)
     when ".7z"          then Dependency.new("p7zip", tags)
+    when ".zip"         then zip_dep_if_needed(tags)
+    when ".bz2"         then bzip2_dep_if_needed(tags)
     end
   end
 end
diff --git a/Library/Homebrew/extend/os/dependency_collector.rb b/Library/Homebrew/extend/os/dependency_collector.rb
index 56fcad31d0..fffec1c999 100644
--- a/Library/Homebrew/extend/os/dependency_collector.rb
+++ b/Library/Homebrew/extend/os/dependency_collector.rb
@@ -1,2 +1,3 @@
 require "dependency_collector"
 require "extend/os/mac/dependency_collector" if OS.mac?
+require "extend/os/linux/dependency_collector" if OS.linux?
diff --git a/Library/Homebrew/extend/os/linux/dependency_collector.rb b/Library/Homebrew/extend/os/linux/dependency_collector.rb
new file mode 100644
index 0000000000..13ea1ab334
--- /dev/null
+++ b/Library/Homebrew/extend/os/linux/dependency_collector.rb
@@ -0,0 +1,27 @@
+class DependencyCollector
+
+  def git_dep_if_needed(tags)
+    Dependency.new("git", tags)
+  end
+
+  def cvs_dep_if_needed(tags)
+    Dependency.new("cvs", tags)
+  end
+
+  def xz_dep_if_needed(tags)
+    Dependency.new("xz", tags)
+  end
+
+  def ld64_dep_if_needed(*)
+    return
+  end
+
+  def zip_dep_if_needed(tags)
+    Dependency.new("zip", tags)
+  end
+
+  def bzip2_dep_if_needed(tags)
+    Dependency.new("bzip2", tags)
+  end
+
+end
diff --git a/Library/Homebrew/extend/os/mac/dependency_collector.rb b/Library/Homebrew/extend/os/mac/dependency_collector.rb
index 108b6ccb2b..1162868794 100644
--- a/Library/Homebrew/extend/os/mac/dependency_collector.rb
+++ b/Library/Homebrew/extend/os/mac/dependency_collector.rb
@@ -23,4 +23,9 @@ class DependencyCollector
     return if MacOS.version > :tiger
     LD64Dependency.new
   end
+
+  def zip_dep_if_needed(tags); end
+
+  def bzip2_dep_if_needed(tags); end
+
 end

From 5a9297612060d25d5c959530330e4a907e0931a8 Mon Sep 17 00:00:00 2001
From: Maxim Belkin <maxim.belkin@gmail.com>
Date: Fri, 16 Feb 2018 10:49:43 -0600
Subject: [PATCH 31/69] Fixing brew-style offenses

---
 Library/Homebrew/dependency_collector.rb                 | 8 ++------
 Library/Homebrew/extend/os/linux/dependency_collector.rb | 6 +-----
 Library/Homebrew/extend/os/mac/dependency_collector.rb   | 1 -
 3 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/Library/Homebrew/dependency_collector.rb b/Library/Homebrew/dependency_collector.rb
index 9e6d6ab0b9..689e4e2f13 100644
--- a/Library/Homebrew/dependency_collector.rb
+++ b/Library/Homebrew/dependency_collector.rb
@@ -72,13 +72,9 @@ class DependencyCollector
 
   def ld64_dep_if_needed(*); end
 
-  def zip_dep_if_needed(tags)
-    return
-  end
+  def zip_dep_if_needed(*); end
 
-  def bzip2_dep_if_needed(tags)
-    return
-  end
+  def bzip2_dep_if_needed(*); end
 
   def self.tar_needs_xz_dependency?
     !new.xz_dep_if_needed([]).nil?
diff --git a/Library/Homebrew/extend/os/linux/dependency_collector.rb b/Library/Homebrew/extend/os/linux/dependency_collector.rb
index 13ea1ab334..61df498ffa 100644
--- a/Library/Homebrew/extend/os/linux/dependency_collector.rb
+++ b/Library/Homebrew/extend/os/linux/dependency_collector.rb
@@ -1,5 +1,4 @@
 class DependencyCollector
-
   def git_dep_if_needed(tags)
     Dependency.new("git", tags)
   end
@@ -12,9 +11,7 @@ class DependencyCollector
     Dependency.new("xz", tags)
   end
 
-  def ld64_dep_if_needed(*)
-    return
-  end
+  def ld64_dep_if_needed(*); end
 
   def zip_dep_if_needed(tags)
     Dependency.new("zip", tags)
@@ -23,5 +20,4 @@ class DependencyCollector
   def bzip2_dep_if_needed(tags)
     Dependency.new("bzip2", tags)
   end
-
 end
diff --git a/Library/Homebrew/extend/os/mac/dependency_collector.rb b/Library/Homebrew/extend/os/mac/dependency_collector.rb
index 1162868794..5fd83f6185 100644
--- a/Library/Homebrew/extend/os/mac/dependency_collector.rb
+++ b/Library/Homebrew/extend/os/mac/dependency_collector.rb
@@ -27,5 +27,4 @@ class DependencyCollector
   def zip_dep_if_needed(tags); end
 
   def bzip2_dep_if_needed(tags); end
-
 end

From a53171d9fe99eee935720bccab84cdfd5092ee5b Mon Sep 17 00:00:00 2001
From: Maxim Belkin <maxim.belkin@gmail.com>
Date: Fri, 16 Feb 2018 14:58:07 -0600
Subject: [PATCH 32/69] Adding tests for dependency_collector on Linux

---
 .../test/dependency_collector_spec.rb         |  1 +
 .../test/os/dependency_collector_spec.rb      |  1 +
 .../os/linux/dependency_collector_spec.rb     | 23 +++++++++++++++++++
 3 files changed, 25 insertions(+)
 create mode 100644 Library/Homebrew/test/os/dependency_collector_spec.rb
 create mode 100644 Library/Homebrew/test/os/linux/dependency_collector_spec.rb

diff --git a/Library/Homebrew/test/dependency_collector_spec.rb b/Library/Homebrew/test/dependency_collector_spec.rb
index 46e859b2d8..f8fb16c029 100644
--- a/Library/Homebrew/test/dependency_collector_spec.rb
+++ b/Library/Homebrew/test/dependency_collector_spec.rb
@@ -140,3 +140,4 @@ describe DependencyCollector do
     end
   end
 end
+require "test/os/dependency_collector_spec"
diff --git a/Library/Homebrew/test/os/dependency_collector_spec.rb b/Library/Homebrew/test/os/dependency_collector_spec.rb
new file mode 100644
index 0000000000..3d7029e405
--- /dev/null
+++ b/Library/Homebrew/test/os/dependency_collector_spec.rb
@@ -0,0 +1 @@
+require "test/os/linux/dependency_collector_spec" if OS.linux?
diff --git a/Library/Homebrew/test/os/linux/dependency_collector_spec.rb b/Library/Homebrew/test/os/linux/dependency_collector_spec.rb
new file mode 100644
index 0000000000..37d61c89be
--- /dev/null
+++ b/Library/Homebrew/test/os/linux/dependency_collector_spec.rb
@@ -0,0 +1,23 @@
+require "dependency_collector"
+
+describe DependencyCollector do
+  alias_matcher :be_a_build_requirement, :be_build
+
+  after(:each) do
+    described_class.clear_cache
+  end
+
+  describe "#add" do
+    it "creates a resource dependency from a '.zip' URL" do
+      resource = Resource.new
+      resource.url("http://example.com/foo.zip")
+      expect(subject.add(resource)).to eq(Dependency.new("zip", [:build]))
+    end
+
+    it "creates a resource dependency from a '.bzip2' URL" do
+      resource = Resource.new
+      resource.url("http://example.com/foo.tar.bzip2")
+      expect(subject.add(resource)).to eq(Dependency.new("bzip2", [:build]))
+    end
+  end
+end

From 5cfcd2ae9f2a4ef731f666e3e78cfb74ae28ae38 Mon Sep 17 00:00:00 2001
From: Maxim Belkin <maxim.belkin@gmail.com>
Date: Fri, 16 Feb 2018 15:04:43 -0600
Subject: [PATCH 33/69] Fixing test

---
 Library/Homebrew/test/os/linux/dependency_collector_spec.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Library/Homebrew/test/os/linux/dependency_collector_spec.rb b/Library/Homebrew/test/os/linux/dependency_collector_spec.rb
index 37d61c89be..eaae99fe92 100644
--- a/Library/Homebrew/test/os/linux/dependency_collector_spec.rb
+++ b/Library/Homebrew/test/os/linux/dependency_collector_spec.rb
@@ -14,9 +14,9 @@ describe DependencyCollector do
       expect(subject.add(resource)).to eq(Dependency.new("zip", [:build]))
     end
 
-    it "creates a resource dependency from a '.bzip2' URL" do
+    it "creates a resource dependency from a '.bz2' URL" do
       resource = Resource.new
-      resource.url("http://example.com/foo.tar.bzip2")
+      resource.url("http://example.com/foo.tar.bz2")
       expect(subject.add(resource)).to eq(Dependency.new("bzip2", [:build]))
     end
   end

From 1b74f21492ca92bb8899304176cfdf4c42def297 Mon Sep 17 00:00:00 2001
From: Maxim Belkin <maxim.belkin@gmail.com>
Date: Fri, 16 Feb 2018 15:08:55 -0600
Subject: [PATCH 34/69] Removing unnecessary  arguments

---
 Library/Homebrew/extend/os/mac/dependency_collector.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Library/Homebrew/extend/os/mac/dependency_collector.rb b/Library/Homebrew/extend/os/mac/dependency_collector.rb
index 5fd83f6185..671a63f558 100644
--- a/Library/Homebrew/extend/os/mac/dependency_collector.rb
+++ b/Library/Homebrew/extend/os/mac/dependency_collector.rb
@@ -24,7 +24,7 @@ class DependencyCollector
     LD64Dependency.new
   end
 
-  def zip_dep_if_needed(tags); end
+  def zip_dep_if_needed(*); end
 
-  def bzip2_dep_if_needed(tags); end
+  def bzip2_dep_if_needed(*); end
 end

From 3dabebbd1643971d1904749530fe6ba73ec38817 Mon Sep 17 00:00:00 2001
From: Maxim Belkin <maxim.belkin@gmail.com>
Date: Mon, 19 Feb 2018 06:49:42 +0000
Subject: [PATCH 35/69] Refactoring based on suggestions

Defaulting zip_dep_if_needed(tags) and bzip2_dep_if_needed(tags)
methods to those on Linux and overriding them on macOS.
---
 Library/Homebrew/dependency_collector.rb      |  8 +++++--
 .../extend/os/dependency_collector.rb         |  1 -
 .../extend/os/linux/dependency_collector.rb   | 23 -------------------
 3 files changed, 6 insertions(+), 26 deletions(-)
 delete mode 100644 Library/Homebrew/extend/os/linux/dependency_collector.rb

diff --git a/Library/Homebrew/dependency_collector.rb b/Library/Homebrew/dependency_collector.rb
index 689e4e2f13..4b8f9e8723 100644
--- a/Library/Homebrew/dependency_collector.rb
+++ b/Library/Homebrew/dependency_collector.rb
@@ -72,9 +72,13 @@ class DependencyCollector
 
   def ld64_dep_if_needed(*); end
 
-  def zip_dep_if_needed(*); end
+  def zip_dep_if_needed(tags)
+    Dependency.new("zip", tags)
+  end
 
-  def bzip2_dep_if_needed(*); end
+  def bzip2_dep_if_needed(tags)
+    Dependency.new("bzip2", tags)
+  end
 
   def self.tar_needs_xz_dependency?
     !new.xz_dep_if_needed([]).nil?
diff --git a/Library/Homebrew/extend/os/dependency_collector.rb b/Library/Homebrew/extend/os/dependency_collector.rb
index fffec1c999..56fcad31d0 100644
--- a/Library/Homebrew/extend/os/dependency_collector.rb
+++ b/Library/Homebrew/extend/os/dependency_collector.rb
@@ -1,3 +1,2 @@
 require "dependency_collector"
 require "extend/os/mac/dependency_collector" if OS.mac?
-require "extend/os/linux/dependency_collector" if OS.linux?
diff --git a/Library/Homebrew/extend/os/linux/dependency_collector.rb b/Library/Homebrew/extend/os/linux/dependency_collector.rb
deleted file mode 100644
index 61df498ffa..0000000000
--- a/Library/Homebrew/extend/os/linux/dependency_collector.rb
+++ /dev/null
@@ -1,23 +0,0 @@
-class DependencyCollector
-  def git_dep_if_needed(tags)
-    Dependency.new("git", tags)
-  end
-
-  def cvs_dep_if_needed(tags)
-    Dependency.new("cvs", tags)
-  end
-
-  def xz_dep_if_needed(tags)
-    Dependency.new("xz", tags)
-  end
-
-  def ld64_dep_if_needed(*); end
-
-  def zip_dep_if_needed(tags)
-    Dependency.new("zip", tags)
-  end
-
-  def bzip2_dep_if_needed(tags)
-    Dependency.new("bzip2", tags)
-  end
-end

From b084a2581f32fcbc6fbdf081ffce9a6c53f66ff6 Mon Sep 17 00:00:00 2001
From: Maxim Belkin <maxim.belkin@gmail.com>
Date: Mon, 19 Feb 2018 07:21:34 +0000
Subject: [PATCH 36/69] Making zip and bzip2 dependecies conditional

Here, we are adding `unless which("zip")` and `unless which("bzip2")`
and, thus, make `zip` and `bzip2` dependencies conditional.
---
 Library/Homebrew/dependency_collector.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Library/Homebrew/dependency_collector.rb b/Library/Homebrew/dependency_collector.rb
index 4b8f9e8723..bd71d61b09 100644
--- a/Library/Homebrew/dependency_collector.rb
+++ b/Library/Homebrew/dependency_collector.rb
@@ -73,11 +73,11 @@ class DependencyCollector
   def ld64_dep_if_needed(*); end
 
   def zip_dep_if_needed(tags)
-    Dependency.new("zip", tags)
+    Dependency.new("zip", tags) unless which("zip")
   end
 
   def bzip2_dep_if_needed(tags)
-    Dependency.new("bzip2", tags)
+    Dependency.new("bzip2", tags) unless which("bzip2")
   end
 
   def self.tar_needs_xz_dependency?

From 73a3592981f7645ba81afef0332def27f553abc4 Mon Sep 17 00:00:00 2001
From: Maxim Belkin <maxim.belkin@gmail.com>
Date: Mon, 19 Feb 2018 08:54:30 +0000
Subject: [PATCH 37/69] Renaming linux-specifix file with tests

Files are globbed based on their name. Therefore, we have to rename
them so tests for Linux are not executed on a Mac.
---
 Library/Homebrew/test/os/dependency_collector_spec.rb           | 2 +-
 .../{dependency_collector_spec.rb => dependency_collector.rb}   | 0
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename Library/Homebrew/test/os/linux/{dependency_collector_spec.rb => dependency_collector.rb} (100%)

diff --git a/Library/Homebrew/test/os/dependency_collector_spec.rb b/Library/Homebrew/test/os/dependency_collector_spec.rb
index 3d7029e405..d190788daa 100644
--- a/Library/Homebrew/test/os/dependency_collector_spec.rb
+++ b/Library/Homebrew/test/os/dependency_collector_spec.rb
@@ -1 +1 @@
-require "test/os/linux/dependency_collector_spec" if OS.linux?
+require "test/os/linux/dependency_collector" if OS.linux?
diff --git a/Library/Homebrew/test/os/linux/dependency_collector_spec.rb b/Library/Homebrew/test/os/linux/dependency_collector.rb
similarity index 100%
rename from Library/Homebrew/test/os/linux/dependency_collector_spec.rb
rename to Library/Homebrew/test/os/linux/dependency_collector.rb

From d25fc5ce50a46b37e84d90151d0ea3c467667231 Mon Sep 17 00:00:00 2001
From: Maxim Belkin <maxim.belkin@gmail.com>
Date: Mon, 19 Feb 2018 09:54:36 +0000
Subject: [PATCH 38/69] Code refactoring

---
 Library/Homebrew/dependency_collector.rb               | 4 ++--
 Library/Homebrew/extend/os/mac/dependency_collector.rb | 8 ++++----
 Library/Homebrew/test/dependency_collector_spec.rb     | 1 -
 Library/Homebrew/test/os/dependency_collector_spec.rb  | 2 +-
 4 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/Library/Homebrew/dependency_collector.rb b/Library/Homebrew/dependency_collector.rb
index bd71d61b09..41e79810ea 100644
--- a/Library/Homebrew/dependency_collector.rb
+++ b/Library/Homebrew/dependency_collector.rb
@@ -166,12 +166,12 @@ class DependencyCollector
   def parse_url_spec(url, tags)
     case File.extname(url)
     when ".xz"          then xz_dep_if_needed(tags)
+    when ".zip"         then zip_dep_if_needed(tags)
+    when ".bz2"         then bzip2_dep_if_needed(tags)
     when ".lha", ".lzh" then Dependency.new("lha", tags)
     when ".lz"          then Dependency.new("lzip", tags)
     when ".rar"         then Dependency.new("unrar", tags)
     when ".7z"          then Dependency.new("p7zip", tags)
-    when ".zip"         then zip_dep_if_needed(tags)
-    when ".bz2"         then bzip2_dep_if_needed(tags)
     end
   end
 end
diff --git a/Library/Homebrew/extend/os/mac/dependency_collector.rb b/Library/Homebrew/extend/os/mac/dependency_collector.rb
index 671a63f558..a7e5d7ffc8 100644
--- a/Library/Homebrew/extend/os/mac/dependency_collector.rb
+++ b/Library/Homebrew/extend/os/mac/dependency_collector.rb
@@ -18,13 +18,13 @@ class DependencyCollector
     Dependency.new("xz", tags)
   end
 
+  def zip_dep_if_needed(tags); end
+
+  def bzip2_dep_if_needed(tags); end
+
   def ld64_dep_if_needed(*)
     # Tiger's ld is too old to properly link some software
     return if MacOS.version > :tiger
     LD64Dependency.new
   end
-
-  def zip_dep_if_needed(*); end
-
-  def bzip2_dep_if_needed(*); end
 end
diff --git a/Library/Homebrew/test/dependency_collector_spec.rb b/Library/Homebrew/test/dependency_collector_spec.rb
index f8fb16c029..46e859b2d8 100644
--- a/Library/Homebrew/test/dependency_collector_spec.rb
+++ b/Library/Homebrew/test/dependency_collector_spec.rb
@@ -140,4 +140,3 @@ describe DependencyCollector do
     end
   end
 end
-require "test/os/dependency_collector_spec"
diff --git a/Library/Homebrew/test/os/dependency_collector_spec.rb b/Library/Homebrew/test/os/dependency_collector_spec.rb
index d190788daa..4fe064732c 100644
--- a/Library/Homebrew/test/os/dependency_collector_spec.rb
+++ b/Library/Homebrew/test/os/dependency_collector_spec.rb
@@ -1 +1 @@
-require "test/os/linux/dependency_collector" if OS.linux?
+require "test/dependency_collector"

From 306c19061ee1211e285cdd6006d852cc26a5ae90 Mon Sep 17 00:00:00 2001
From: Maxim Belkin <maxim.belkin@gmail.com>
Date: Mon, 19 Feb 2018 09:58:30 +0000
Subject: [PATCH 39/69] Code refactoring v2.0

---
 Library/Homebrew/dependency_collector.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Library/Homebrew/dependency_collector.rb b/Library/Homebrew/dependency_collector.rb
index 41e79810ea..0a38f0de39 100644
--- a/Library/Homebrew/dependency_collector.rb
+++ b/Library/Homebrew/dependency_collector.rb
@@ -70,8 +70,6 @@ class DependencyCollector
     Dependency.new("xz", tags)
   end
 
-  def ld64_dep_if_needed(*); end
-
   def zip_dep_if_needed(tags)
     Dependency.new("zip", tags) unless which("zip")
   end
@@ -80,6 +78,8 @@ class DependencyCollector
     Dependency.new("bzip2", tags) unless which("bzip2")
   end
 
+  def ld64_dep_if_needed(*); end
+
   def self.tar_needs_xz_dependency?
     !new.xz_dep_if_needed([]).nil?
   end

From c6dac68d8bdb652152d89a097a9ab9f270832d68 Mon Sep 17 00:00:00 2001
From: Maxim Belkin <maxim.belkin@gmail.com>
Date: Mon, 19 Feb 2018 10:21:01 +0000
Subject: [PATCH 40/69] Code refactoring v3.0

---
 .../test/os/dependency_collector_spec.rb      | 24 ++++++++++++++++++-
 .../test/os/linux/dependency_collector.rb     | 23 ------------------
 2 files changed, 23 insertions(+), 24 deletions(-)
 delete mode 100644 Library/Homebrew/test/os/linux/dependency_collector.rb

diff --git a/Library/Homebrew/test/os/dependency_collector_spec.rb b/Library/Homebrew/test/os/dependency_collector_spec.rb
index 4fe064732c..eaae99fe92 100644
--- a/Library/Homebrew/test/os/dependency_collector_spec.rb
+++ b/Library/Homebrew/test/os/dependency_collector_spec.rb
@@ -1 +1,23 @@
-require "test/dependency_collector"
+require "dependency_collector"
+
+describe DependencyCollector do
+  alias_matcher :be_a_build_requirement, :be_build
+
+  after(:each) do
+    described_class.clear_cache
+  end
+
+  describe "#add" do
+    it "creates a resource dependency from a '.zip' URL" do
+      resource = Resource.new
+      resource.url("http://example.com/foo.zip")
+      expect(subject.add(resource)).to eq(Dependency.new("zip", [:build]))
+    end
+
+    it "creates a resource dependency from a '.bz2' URL" do
+      resource = Resource.new
+      resource.url("http://example.com/foo.tar.bz2")
+      expect(subject.add(resource)).to eq(Dependency.new("bzip2", [:build]))
+    end
+  end
+end
diff --git a/Library/Homebrew/test/os/linux/dependency_collector.rb b/Library/Homebrew/test/os/linux/dependency_collector.rb
deleted file mode 100644
index eaae99fe92..0000000000
--- a/Library/Homebrew/test/os/linux/dependency_collector.rb
+++ /dev/null
@@ -1,23 +0,0 @@
-require "dependency_collector"
-
-describe DependencyCollector do
-  alias_matcher :be_a_build_requirement, :be_build
-
-  after(:each) do
-    described_class.clear_cache
-  end
-
-  describe "#add" do
-    it "creates a resource dependency from a '.zip' URL" do
-      resource = Resource.new
-      resource.url("http://example.com/foo.zip")
-      expect(subject.add(resource)).to eq(Dependency.new("zip", [:build]))
-    end
-
-    it "creates a resource dependency from a '.bz2' URL" do
-      resource = Resource.new
-      resource.url("http://example.com/foo.tar.bz2")
-      expect(subject.add(resource)).to eq(Dependency.new("bzip2", [:build]))
-    end
-  end
-end

From a9c64c319f8b8ef4aa3c0265bbe735002daa0d60 Mon Sep 17 00:00:00 2001
From: Mike McQuaid <mike@mikemcquaid.com>
Date: Mon, 19 Feb 2018 16:14:32 +0000
Subject: [PATCH 41/69] gist-logs: require API credentials.

Anonymous gists are going away shortly:
https://github.com/blog/2503-deprecation-notice-removing-anonymous-gist-creation
---
 Library/Homebrew/cmd/gist-logs.rb | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/Library/Homebrew/cmd/gist-logs.rb b/Library/Homebrew/cmd/gist-logs.rb
index 630361ca2b..ab81a017e2 100644
--- a/Library/Homebrew/cmd/gist-logs.rb
+++ b/Library/Homebrew/cmd/gist-logs.rb
@@ -39,6 +39,16 @@ module Homebrew
       files["00.tap.out"] = { content: tap }
     end
 
+    if GitHub.api_credentials_type == :none
+      puts <<~EOS
+        You can create a new personal access token:
+         #{GitHub::ALL_SCOPES_URL}
+        and then set the new HOMEBREW_GITHUB_API_TOKEN as the authentication method.
+
+      EOS
+      login!
+    end
+
     # Description formatted to work well as page title when viewing gist
     if f.core_formula?
       descr = "#{f.name} on #{OS_VERSION} - Homebrew build logs"
@@ -48,16 +58,6 @@ module Homebrew
     url = create_gist(files, descr)
 
     if ARGV.include?("--new-issue") || ARGV.switch?("n")
-      if GitHub.api_credentials_type == :none
-        puts <<~EOS
-          You can create a new personal access token:
-           #{GitHub::ALL_SCOPES_URL}
-          and then set the new HOMEBREW_GITHUB_API_TOKEN as the authentication method.
-
-        EOS
-        login!
-      end
-
       url = create_issue(f.tap, "#{f.name} failed to build on #{MacOS.full_version}", url)
     end
 

From 84be0f82d4552b1c41c5ca1ad63c39df4a59f40f Mon Sep 17 00:00:00 2001
From: Mike McQuaid <mike@mikemcquaid.com>
Date: Tue, 20 Feb 2018 09:12:47 +0000
Subject: [PATCH 42/69] brew.sh: use system curl on Linux where possible.

Result of discussion in #3809.
---
 Library/Homebrew/brew.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Library/Homebrew/brew.sh b/Library/Homebrew/brew.sh
index a9074a6438..61d85ddd2a 100644
--- a/Library/Homebrew/brew.sh
+++ b/Library/Homebrew/brew.sh
@@ -75,7 +75,6 @@ case "$HOMEBREW_SYSTEM" in
   Linux)  HOMEBREW_LINUX="1" ;;
 esac
 
-HOMEBREW_CURL="curl"
 if [[ -n "$HOMEBREW_MACOS" ]]
 then
   HOMEBREW_PROCESSOR="$(uname -p)"
@@ -107,7 +106,6 @@ else
   [[ -n "$HOMEBREW_LINUX" ]] && HOMEBREW_OS_VERSION="$(lsb_release -sd 2>/dev/null)"
   : "${HOMEBREW_OS_VERSION:=$(uname -r)}"
   HOMEBREW_OS_USER_AGENT_VERSION="$HOMEBREW_OS_VERSION"
-  HOMEBREW_FORCE_BREWED_CURL=1
 
   if [[ -z "$HOMEBREW_CACHE" ]]
   then
@@ -125,6 +123,8 @@ if [[ -n "$HOMEBREW_FORCE_BREWED_CURL" &&
          "$HOMEBREW_PREFIX/opt/curl/bin/curl" --version >/dev/null
 then
   HOMEBREW_CURL="$HOMEBREW_PREFIX/opt/curl/bin/curl"
+else
+  HOMEBREW_CURL="curl"
 fi
 
 HOMEBREW_USER_AGENT="$HOMEBREW_PRODUCT/$HOMEBREW_USER_AGENT_VERSION ($HOMEBREW_SYSTEM; $HOMEBREW_PROCESSOR $HOMEBREW_OS_USER_AGENT_VERSION)"

From 73ba9b3d880ae72e2dd8649d60b3a338ba744ac0 Mon Sep 17 00:00:00 2001
From: Shaun Jackman <sjackman@gmail.com>
Date: Tue, 20 Feb 2018 11:13:13 -0800
Subject: [PATCH 43/69] Define OS::Mac on Linux

Define MacOS.version, MacOS.full_version, and MacOS::Xcode.version to
Version::NULL on Linux so that brew readall succeeds and Homebrew/brew
can tap Homebrew/core on Linux.
---
 Library/Homebrew/os.rb       |  1 +
 Library/Homebrew/os/linux.rb | 28 ++++++++++++++++++++++++++++
 2 files changed, 29 insertions(+)
 create mode 100644 Library/Homebrew/os/linux.rb

diff --git a/Library/Homebrew/os.rb b/Library/Homebrew/os.rb
index d35a49dd7b..d56b032286 100644
--- a/Library/Homebrew/os.rb
+++ b/Library/Homebrew/os.rb
@@ -21,6 +21,7 @@ module OS
     end
     PATH_OPEN = "/usr/bin/open".freeze
   elsif OS.linux?
+    require "os/linux"
     ISSUES_URL = "https://github.com/Linuxbrew/brew/wiki/troubleshooting".freeze
     PATH_OPEN = "xdg-open".freeze
   end
diff --git a/Library/Homebrew/os/linux.rb b/Library/Homebrew/os/linux.rb
new file mode 100644
index 0000000000..e5af301b2f
--- /dev/null
+++ b/Library/Homebrew/os/linux.rb
@@ -0,0 +1,28 @@
+module OS
+  # Define OS::Mac on Linux for formula API compatibility.
+  module Mac
+    module_function
+
+    ::MacOS = self # rubocop:disable Naming/ConstantName
+
+    def prefer_64_bit?
+      Hardware::CPU.is_64_bit?
+    end
+
+    def version
+      Version::NULL
+    end
+
+    def full_version
+      Version::NULL
+    end
+
+    module Xcode
+      module_function
+
+      def version
+        Version::NULL
+      end
+    end
+  end
+end

From 14d7a7a08c9aab7db14ea03f59ec85899e5e3ba6 Mon Sep 17 00:00:00 2001
From: Maxim Belkin <maxim.belkin@gmail.com>
Date: Tue, 20 Feb 2018 21:33:38 +0000
Subject: [PATCH 44/69] Code refactoring 4.0

---
 .../extend/os/dependency_collector.rb         |  1 +
 .../extend/os/linux/dependency_collector.rb   |  5 ++
 .../test/os/dependency_collector_spec.rb      | 23 --------
 .../os/linux/dependency_collector_spec.rb     | 53 +++++++++++++++++++
 .../test/os/mac/dependency_collector_spec.rb  | 12 +++++
 5 files changed, 71 insertions(+), 23 deletions(-)
 create mode 100644 Library/Homebrew/extend/os/linux/dependency_collector.rb
 delete mode 100644 Library/Homebrew/test/os/dependency_collector_spec.rb
 create mode 100644 Library/Homebrew/test/os/linux/dependency_collector_spec.rb

diff --git a/Library/Homebrew/extend/os/dependency_collector.rb b/Library/Homebrew/extend/os/dependency_collector.rb
index 56fcad31d0..fffec1c999 100644
--- a/Library/Homebrew/extend/os/dependency_collector.rb
+++ b/Library/Homebrew/extend/os/dependency_collector.rb
@@ -1,2 +1,3 @@
 require "dependency_collector"
 require "extend/os/mac/dependency_collector" if OS.mac?
+require "extend/os/linux/dependency_collector" if OS.linux?
diff --git a/Library/Homebrew/extend/os/linux/dependency_collector.rb b/Library/Homebrew/extend/os/linux/dependency_collector.rb
new file mode 100644
index 0000000000..dc5b994b8a
--- /dev/null
+++ b/Library/Homebrew/extend/os/linux/dependency_collector.rb
@@ -0,0 +1,5 @@
+class DependencyCollector
+  def xz_dep_if_needed(tags)
+    Dependency.new("xz", tags) unless which("xz")
+  end
+end
diff --git a/Library/Homebrew/test/os/dependency_collector_spec.rb b/Library/Homebrew/test/os/dependency_collector_spec.rb
deleted file mode 100644
index eaae99fe92..0000000000
--- a/Library/Homebrew/test/os/dependency_collector_spec.rb
+++ /dev/null
@@ -1,23 +0,0 @@
-require "dependency_collector"
-
-describe DependencyCollector do
-  alias_matcher :be_a_build_requirement, :be_build
-
-  after(:each) do
-    described_class.clear_cache
-  end
-
-  describe "#add" do
-    it "creates a resource dependency from a '.zip' URL" do
-      resource = Resource.new
-      resource.url("http://example.com/foo.zip")
-      expect(subject.add(resource)).to eq(Dependency.new("zip", [:build]))
-    end
-
-    it "creates a resource dependency from a '.bz2' URL" do
-      resource = Resource.new
-      resource.url("http://example.com/foo.tar.bz2")
-      expect(subject.add(resource)).to eq(Dependency.new("bzip2", [:build]))
-    end
-  end
-end
diff --git a/Library/Homebrew/test/os/linux/dependency_collector_spec.rb b/Library/Homebrew/test/os/linux/dependency_collector_spec.rb
new file mode 100644
index 0000000000..5771fd59a2
--- /dev/null
+++ b/Library/Homebrew/test/os/linux/dependency_collector_spec.rb
@@ -0,0 +1,53 @@
+require "dependency_collector"
+
+describe DependencyCollector do
+  alias_matcher :be_a_build_requirement, :be_build
+
+  after(:each) do
+    described_class.clear_cache
+  end
+
+  describe "#add" do
+    resource = Resource.new
+
+    context "when xz, zip, and bzip2 are not available" do
+      it "creates a resource dependency from a '.xz' URL" do
+	resource.url("http://example.com/foo.xz")
+	allow_any_instance_of(Object).to receive(:which).with("xz")
+	expect(subject.add(resource)).to eq(Dependency.new("xz", [:build]))
+      end
+
+      it "creates a resource dependency from a '.zip' URL" do
+	resource.url("http://example.com/foo.zip")
+	allow_any_instance_of(Object).to receive(:which).with("zip")
+	expect(subject.add(resource)).to eq(Dependency.new("zip", [:build]))
+      end
+
+      it "creates a resource dependency from a '.bz2' URL" do
+	resource.url("http://example.com/foo.tar.bz2")
+	allow_any_instance_of(Object).to receive(:which).with("bzip2")
+	expect(subject.add(resource)).to eq(Dependency.new("bzip2", [:build]))
+      end
+    end
+
+    context "when xz, zip, and bzip2 are available" do
+      it "does not create a resource dependency from a '.xz' URL" do
+	resource.url("http://example.com/foo.xz")
+	allow_any_instance_of(Object).to receive(:which).with("xz").and_return(Pathname.new("foo"))
+	expect(subject.add(resource)).to be nil
+      end
+
+      it "does not create a resource dependency from a '.zip' URL" do
+	resource.url("http://example.com/foo.zip")
+	allow_any_instance_of(Object).to receive(:which).with("zip").and_return(Pathname.new("foo"))
+	expect(subject.add(resource)).to be nil
+      end
+
+      it "does not create a resource dependency from a '.bz2' URL" do
+	resource.url("http://example.com/foo.tar.bz2")
+	allow_any_instance_of(Object).to receive(:which).with("bzip2").and_return(Pathname.new("foo"))
+	expect(subject.add(resource)).to be nil
+      end
+    end
+  end
+end
diff --git a/Library/Homebrew/test/os/mac/dependency_collector_spec.rb b/Library/Homebrew/test/os/mac/dependency_collector_spec.rb
index 5d260ebf71..a8fe8ba54c 100644
--- a/Library/Homebrew/test/os/mac/dependency_collector_spec.rb
+++ b/Library/Homebrew/test/os/mac/dependency_collector_spec.rb
@@ -36,6 +36,18 @@ describe DependencyCollector do
     expect(subject.add(resource)).to be nil
   end
 
+  specify "Resource dependency from a '.zip' URL" do
+    resource = Resource.new
+    resource.url("http://example.com/foo.zip")
+    expect(subject.add(resource)).to be nil
+  end
+
+  specify "Resource dependency from a '.bz2' URL" do
+    resource = Resource.new
+    resource.url("http://example.com/foo.tar.bz2")
+    expect(subject.add(resource)).to be nil
+  end
+
   specify "Resource dependency from a '.git' URL" do
     resource = Resource.new
     resource.url("git://example.com/foo/bar.git")

From dd2288a5b2386f0b27b2593a2045014668cc8456 Mon Sep 17 00:00:00 2001
From: Mike McQuaid <mike@mikemcquaid.com>
Date: Wed, 21 Feb 2018 08:49:13 +0000
Subject: [PATCH 45/69] dependency_collector: don't create symbol deps.

Need to convert this to a string first or things explode.
---
 Library/Homebrew/compat/dependency_collector.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Library/Homebrew/compat/dependency_collector.rb b/Library/Homebrew/compat/dependency_collector.rb
index 84d5431f3e..88d393488f 100644
--- a/Library/Homebrew/compat/dependency_collector.rb
+++ b/Library/Homebrew/compat/dependency_collector.rb
@@ -59,7 +59,7 @@ class DependencyCollector
         Dependency.new("python3", tags)
       when :emacs, :mysql, :perl, :postgresql, :rbenv, :ruby
         output_deprecation(spec)
-        Dependency.new(spec, tags)
+        Dependency.new(spec.to_s, tags)
       else
         super
       end

From 157f84a74d4274f1fcfc73eda94a819cb68df944 Mon Sep 17 00:00:00 2001
From: Mike McQuaid <mike@mikemcquaid.com>
Date: Wed, 21 Feb 2018 09:04:34 +0000
Subject: [PATCH 46/69] travis.yml: use homebrew/homebrew-core on Linux.

---
 .travis.yml | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index fd43e39420..37417a10a1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -36,22 +36,13 @@ before_install:
       mv "$HOMEBREW_REPOSITORY/Library/Taps" "$PWD/Library";
       sudo rm -rf "$HOMEBREW_REPOSITORY";
       sudo ln -s "$PWD" "$HOMEBREW_REPOSITORY";
-    else
-      HOMEBREW_CORE_TAP_DIR="$(brew --repo "homebrew/core")";
-      mkdir -p "$HOMEBREW_CORE_TAP_DIR";
     fi
   - if [ "$MACOS" ]; then
       travis_retry git -C Library/Taps/homebrew/homebrew-core fetch --depth=1 origin;
+    else
+      travis_retry git clone --depth=1 https://github.com/Homebrew/homebrew-core Library/Taps/homebrew/homebrew-core;
     fi
   - travis_retry git clone --depth=1 https://github.com/Homebrew/homebrew-test-bot Library/Taps/homebrew/homebrew-test-bot
-  - if [ "$LINUX" ]; then
-      HOMEBREW_TEST_BOT_TAP_DIR="$(brew --repo "homebrew/test-bot")";
-      ln -s "$HOMEBREW_TEST_BOT_TAP_DIR/.git" "$HOMEBREW_TEST_BOT_TAP_DIR/Formula" "$HOMEBREW_CORE_TAP_DIR";
-    fi
-  # can be removed after 1.5.3 is tagged
-  - if [ "$LINUX" ]; then
-      export HOMEBREW_FORCE_VENDOR_RUBY=1;
-    fi
 
 script:
   - brew test-bot

From c83dd0d04b857161b47a43b54ba56c7296ac50c0 Mon Sep 17 00:00:00 2001
From: Maxim Belkin <maxim.belkin@gmail.com>
Date: Wed, 21 Feb 2018 13:44:51 +0000
Subject: [PATCH 47/69] brew style: replace tabs with spaces

---
 .../os/linux/dependency_collector_spec.rb     | 36 +++++++++----------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/Library/Homebrew/test/os/linux/dependency_collector_spec.rb b/Library/Homebrew/test/os/linux/dependency_collector_spec.rb
index 5771fd59a2..543ed39b0b 100644
--- a/Library/Homebrew/test/os/linux/dependency_collector_spec.rb
+++ b/Library/Homebrew/test/os/linux/dependency_collector_spec.rb
@@ -12,41 +12,41 @@ describe DependencyCollector do
 
     context "when xz, zip, and bzip2 are not available" do
       it "creates a resource dependency from a '.xz' URL" do
-	resource.url("http://example.com/foo.xz")
-	allow_any_instance_of(Object).to receive(:which).with("xz")
-	expect(subject.add(resource)).to eq(Dependency.new("xz", [:build]))
+        resource.url("http://example.com/foo.xz")
+        allow_any_instance_of(Object).to receive(:which).with("xz")
+        expect(subject.add(resource)).to eq(Dependency.new("xz", [:build]))
       end
 
       it "creates a resource dependency from a '.zip' URL" do
-	resource.url("http://example.com/foo.zip")
-	allow_any_instance_of(Object).to receive(:which).with("zip")
-	expect(subject.add(resource)).to eq(Dependency.new("zip", [:build]))
+        resource.url("http://example.com/foo.zip")
+        allow_any_instance_of(Object).to receive(:which).with("zip")
+        expect(subject.add(resource)).to eq(Dependency.new("zip", [:build]))
       end
 
       it "creates a resource dependency from a '.bz2' URL" do
-	resource.url("http://example.com/foo.tar.bz2")
-	allow_any_instance_of(Object).to receive(:which).with("bzip2")
-	expect(subject.add(resource)).to eq(Dependency.new("bzip2", [:build]))
+        resource.url("http://example.com/foo.tar.bz2")
+        allow_any_instance_of(Object).to receive(:which).with("bzip2")
+        expect(subject.add(resource)).to eq(Dependency.new("bzip2", [:build]))
       end
     end
 
     context "when xz, zip, and bzip2 are available" do
       it "does not create a resource dependency from a '.xz' URL" do
-	resource.url("http://example.com/foo.xz")
-	allow_any_instance_of(Object).to receive(:which).with("xz").and_return(Pathname.new("foo"))
-	expect(subject.add(resource)).to be nil
+        resource.url("http://example.com/foo.xz")
+        allow_any_instance_of(Object).to receive(:which).with("xz").and_return(Pathname.new("foo"))
+        expect(subject.add(resource)).to be nil
       end
 
       it "does not create a resource dependency from a '.zip' URL" do
-	resource.url("http://example.com/foo.zip")
-	allow_any_instance_of(Object).to receive(:which).with("zip").and_return(Pathname.new("foo"))
-	expect(subject.add(resource)).to be nil
+        resource.url("http://example.com/foo.zip")
+        allow_any_instance_of(Object).to receive(:which).with("zip").and_return(Pathname.new("foo"))
+        expect(subject.add(resource)).to be nil
       end
 
       it "does not create a resource dependency from a '.bz2' URL" do
-	resource.url("http://example.com/foo.tar.bz2")
-	allow_any_instance_of(Object).to receive(:which).with("bzip2").and_return(Pathname.new("foo"))
-	expect(subject.add(resource)).to be nil
+        resource.url("http://example.com/foo.tar.bz2")
+        allow_any_instance_of(Object).to receive(:which).with("bzip2").and_return(Pathname.new("foo"))
+        expect(subject.add(resource)).to be nil
       end
     end
   end

From f8874004c2c0ee06b3f0420ac549f762beeb3433 Mon Sep 17 00:00:00 2001
From: Maxim Belkin <maxim.belkin@gmail.com>
Date: Wed, 21 Feb 2018 14:11:35 +0000
Subject: [PATCH 48/69] Make 'xz' and 'cvs' dependencies conditional

---
 Library/Homebrew/dependency_collector.rb                 | 4 ++--
 Library/Homebrew/extend/os/dependency_collector.rb       | 1 -
 Library/Homebrew/extend/os/linux/dependency_collector.rb | 5 -----
 3 files changed, 2 insertions(+), 8 deletions(-)
 delete mode 100644 Library/Homebrew/extend/os/linux/dependency_collector.rb

diff --git a/Library/Homebrew/dependency_collector.rb b/Library/Homebrew/dependency_collector.rb
index 0a38f0de39..7d3b90f9c6 100644
--- a/Library/Homebrew/dependency_collector.rb
+++ b/Library/Homebrew/dependency_collector.rb
@@ -63,11 +63,11 @@ class DependencyCollector
   end
 
   def cvs_dep_if_needed(tags)
-    Dependency.new("cvs", tags)
+    Dependency.new("cvs", tags) unless which("cvs")
   end
 
   def xz_dep_if_needed(tags)
-    Dependency.new("xz", tags)
+    Dependency.new("xz", tags) unless which("xz")
   end
 
   def zip_dep_if_needed(tags)
diff --git a/Library/Homebrew/extend/os/dependency_collector.rb b/Library/Homebrew/extend/os/dependency_collector.rb
index fffec1c999..56fcad31d0 100644
--- a/Library/Homebrew/extend/os/dependency_collector.rb
+++ b/Library/Homebrew/extend/os/dependency_collector.rb
@@ -1,3 +1,2 @@
 require "dependency_collector"
 require "extend/os/mac/dependency_collector" if OS.mac?
-require "extend/os/linux/dependency_collector" if OS.linux?
diff --git a/Library/Homebrew/extend/os/linux/dependency_collector.rb b/Library/Homebrew/extend/os/linux/dependency_collector.rb
deleted file mode 100644
index dc5b994b8a..0000000000
--- a/Library/Homebrew/extend/os/linux/dependency_collector.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-class DependencyCollector
-  def xz_dep_if_needed(tags)
-    Dependency.new("xz", tags) unless which("xz")
-  end
-end

From 66410ccf1be4255952b80c0b073514825f4ce8c6 Mon Sep 17 00:00:00 2001
From: Mike McQuaid <mike@mikemcquaid.com>
Date: Wed, 21 Feb 2018 18:04:14 +0000
Subject: [PATCH 49/69] Versions: additional formulae requirements.

These should help keep these formulae more maintainable.
---
 docs/Versions.md | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/docs/Versions.md b/docs/Versions.md
index 282640a1f0..2fa3f563f5 100644
--- a/docs/Versions.md
+++ b/docs/Versions.md
@@ -11,8 +11,11 @@ Versioned formulae we include in [homebrew/core](https://github.com/homebrew/hom
 * Versioned formulae should differ in major/minor (not patch) versions from the current stable release. This is because patch versions indicate bug or security updates and we want to ensure you apply security updates.
 * Upstream should have a release branch for the versioned formulae version and still make security updates for that version, when necessary. For example, [PHP 5.5 was not a supported version but PHP 7.2 was](http://php.net/supported-versions.php) in January 2018
 * Formulae that depend on versioned formulae must not depend on the same formulae at two different versions twice in their recursive dependencies. For example, if you depend on `openssl@1.0` and `foo`, and `foo` depends on `openssl` then you must instead use `openssl`.
-* Versioned formulae should only be linkable at the same time as their non-versioned counterpart if the upstream project provides support for it, e.g. using suffixed binaries. If this is not possible, use `keg_only :versioned_formula` to allow users to have multiple versions installed at once. Note `keg_only :versioned_formula` should not `post_install` anything in the `HOMEBREW_PREFIX` that conflicts with or duplicates the non-versioned counterpart (or other versioned formulae). For example, a `node@6` formula should not install its `npm` into `HOMEBREW_PREFIX` like the `node` formula does.
+* Versioned formulae should only be linkable at the same time as their non-versioned counterpart if the upstream project provides support for it, e.g. using suffixed binaries. If this is not possible, use `keg_only :versioned_formula` to allow users to have multiple versions installed at once.
+* A `keg_only :versioned_formula` should not `post_install` anything in the `HOMEBREW_PREFIX` that conflicts with or duplicates the non-versioned counterpart (or other versioned formulae). For example, a `node@6` formula should not install its `npm` into `HOMEBREW_PREFIX` like the `node` formula does.
 * Versioned formulae submitted should be expected to be used by a large number of people. If this ceases to be the case: they will be removed. We will aim not to remove those in the [top 1000 `install_on_request` formulae](https://brew.sh/analytics/install-on-request/).
+* Versioned formulae should not have `resource`s that require security updates. For example, a `node@6` formula should not have an `npm` resource but instead rely on the `npm` provided by the upstream tarball.
+* Versioned formulae should be as similar as possible and sensible to the unversioned formulae. Creating or updating a versioned formula should be a chance to ask questions of the unversioned formula e.g. can some unused or useless options be removed or made default?
 * No more than five versions of a formula (including the non-versioned one) will be supported at any given time, regardless of usage. When removing formulae that violate this we will aim to do so based on usage and support status rather than age.
 
 Homebrew's versions are not intended to be used for any old versions you personally require for your project. You should create your own [tap](How-to-Create-and-Maintain-a-Tap.md) for formulae you or your organisation wish to control the versioning of or those that do not meet the above standards. Software that has regular API or ABI breaking releases still needs to meet all the above requirements; that a `brew upgrade` has broken something for you is not an argument for us to add and maintain a formula for you.

From 5536f49305fbb45261afcc1740a7a943a1c95f40 Mon Sep 17 00:00:00 2001
From: Maxim Belkin <maxim.belkin@gmail.com>
Date: Thu, 22 Feb 2018 14:20:23 +0000
Subject: [PATCH 50/69] Cross-platform java detection

---
 Library/Homebrew/extend/os/mac/system_config.rb | 13 +++++++++++++
 Library/Homebrew/system_config.rb               | 12 +++---------
 2 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/Library/Homebrew/extend/os/mac/system_config.rb b/Library/Homebrew/extend/os/mac/system_config.rb
index 7961347810..c0a28d3e95 100644
--- a/Library/Homebrew/extend/os/mac/system_config.rb
+++ b/Library/Homebrew/extend/os/mac/system_config.rb
@@ -23,6 +23,19 @@ class SystemConfig
       @ponk.join(", ") unless @ponk.empty?
     end
 
+    def describe_java
+      # java_home doesn't exist on all macOSs; it might be missing on older versions.
+      return "N/A" unless File.executable? "/usr/libexec/java_home"
+
+      java_xml = Utils.popen_read("/usr/libexec/java_home", "--xml", "--failfast", err: :close)
+      return "N/A" unless $CHILD_STATUS.success?
+      javas = []
+      REXML::XPath.each(REXML::Document.new(java_xml), "//key[text()='JVMVersion']/following-sibling::string") do |item|
+        javas << item.text
+      end
+      javas.uniq.join(", ")
+    end
+
     def describe_xquartz
       return "N/A" unless MacOS::XQuartz.installed?
       "#{MacOS::XQuartz.version} => #{describe_path(MacOS::XQuartz.prefix)}"
diff --git a/Library/Homebrew/system_config.rb b/Library/Homebrew/system_config.rb
index 28eecf951f..9a8d1d9d3a 100644
--- a/Library/Homebrew/system_config.rb
+++ b/Library/Homebrew/system_config.rb
@@ -131,16 +131,10 @@ class SystemConfig
     end
 
     def describe_java
-      # java_home doesn't exist on all macOSs; it might be missing on older versions.
-      return "N/A" unless File.executable? "/usr/libexec/java_home"
-
-      java_xml = Utils.popen_read("/usr/libexec/java_home", "--xml", "--failfast", err: :close)
+      return "N/A" unless which "java"
+      java_version = Utils.popen_read("java", "-version")
       return "N/A" unless $CHILD_STATUS.success?
-      javas = []
-      REXML::XPath.each(REXML::Document.new(java_xml), "//key[text()='JVMVersion']/following-sibling::string") do |item|
-        javas << item.text
-      end
-      javas.uniq.join(", ")
+      java_version[/java version "([0-9\._]+)"/, 1] || "N/A"
     end
 
     def describe_git

From 977c3323d2a795d6f57cd70cb6b2453f38084ed9 Mon Sep 17 00:00:00 2001
From: Mike McQuaid <mike@mikemcquaid.com>
Date: Thu, 22 Feb 2018 18:47:29 +0000
Subject: [PATCH 51/69] docs.brew.sh updates

- Remove no longer needed `acme-challenge` file
- Set title, description, social image, logo, etc. for SEO
- Use extensionless permalinks (old links still work)
- Cleanup `_config.yml`
- Import latest `_layouts/base` from https://brew.sh
---
 ...gQNmjNTd6fUriinp4XpuRI5PBGp7zEXbEEsQceSD0k |  1 -
 docs/Common-Issues.md                         |  2 +-
 docs/Formula-Cookbook.md                      |  2 +-
 docs/Manpage.md                               | 10 ++--
 docs/New-Maintainer-Checklist.md              |  4 +-
 docs/_config.yml                              | 38 ++++++++++-----
 docs/_layouts/base.html                       | 46 ++++++++++++-------
 7 files changed, 65 insertions(+), 38 deletions(-)
 delete mode 100644 docs/.well-known/acme-challenge/CgQNmjNTd6fUriinp4XpuRI5PBGp7zEXbEEsQceSD0k

diff --git a/docs/.well-known/acme-challenge/CgQNmjNTd6fUriinp4XpuRI5PBGp7zEXbEEsQceSD0k b/docs/.well-known/acme-challenge/CgQNmjNTd6fUriinp4XpuRI5PBGp7zEXbEEsQceSD0k
deleted file mode 100644
index d3ba42ff4b..0000000000
--- a/docs/.well-known/acme-challenge/CgQNmjNTd6fUriinp4XpuRI5PBGp7zEXbEEsQceSD0k
+++ /dev/null
@@ -1 +0,0 @@
-CgQNmjNTd6fUriinp4XpuRI5PBGp7zEXbEEsQceSD0k.unNjkXuFqjKx4BO8gem4nzeMm1tSZxPPeBjNqQhFCqQ
diff --git a/docs/Common-Issues.md b/docs/Common-Issues.md
index 01ab4e8065..a3a31ce80b 100644
--- a/docs/Common-Issues.md
+++ b/docs/Common-Issues.md
@@ -80,7 +80,7 @@ When running `brew upgrade`, you see something like this:
 $ brew upgrade
 Error: undefined method `include?' for nil:NilClass
 Please report this bug:
-    https://docs.brew.sh/Troubleshooting.html
+    https://docs.brew.sh/Troubleshooting
 /usr/local/Library/Homebrew/formula.rb:393:in `canonical_name'
 /usr/local/Library/Homebrew/formula.rb:425:in `factory'
 /usr/local/Library/Contributions/examples/brew-upgrade.rb:7
diff --git a/docs/Formula-Cookbook.md b/docs/Formula-Cookbook.md
index c4db9e9f8b..1f2b2e89e2 100644
--- a/docs/Formula-Cookbook.md
+++ b/docs/Formula-Cookbook.md
@@ -344,7 +344,7 @@ If you have already forked Homebrew on GitHub, then you can manually push (just
 git push https://github.com/myname/homebrew-core/ <what-you-called-your-branch>
 ```
 
-Now, [open a pull request](https://docs.brew.sh/How-To-Open-a-Homebrew-Pull-Request.html) for your changes.
+Now, [open a pull request](https://docs.brew.sh/How-To-Open-a-Homebrew-Pull-Request) for your changes.
 
 *   One formula per commit; one commit per formula
 *   Keep merge commits out of the pull request
diff --git a/docs/Manpage.md b/docs/Manpage.md
index e4f189490b..91f9e0414d 100644
--- a/docs/Manpage.md
+++ b/docs/Manpage.md
@@ -39,7 +39,7 @@ With `--verbose` or `-v`, many commands print extra debugging information. Note
 
   * `analytics` [`state`]:
     Display anonymous user behaviour analytics state.
-    Read more at <https://docs.brew.sh/Analytics.html>.
+    Read more at <https://docs.brew.sh/Analytics>.
 
   * `analytics` (`on`|`off`):
     Turn on/off Homebrew's analytics.
@@ -212,7 +212,7 @@ With `--verbose` or `-v`, many commands print extra debugging information. Note
     information on all installed formulae.
 
     See the docs for examples of using the JSON output:
-    <https://docs.brew.sh/Querying-Brew.html>
+    <https://docs.brew.sh/Querying-Brew>
 
   * `install` [`--debug`] [`--env=`(`std`|`super`)] [`--ignore-dependencies`|`--only-dependencies`] [`--cc=``compiler`] [`--build-from-source`|`--force-bottle`] [`--devel`|`--HEAD`] [`--keep-tmp`] [`--build-bottle`] [`--force`] [`--verbose`] `formula` [`options` ...]:
     Install `formula`.
@@ -493,7 +493,7 @@ With `--verbose` or `-v`, many commands print extra debugging information. Note
     Pass `--installed` to get information on installed taps.
 
     See the docs for examples of using the JSON output:
-    <https://docs.brew.sh/Querying-Brew.html>
+    <https://docs.brew.sh/Querying-Brew>
 
   * `tap-pin` `tap`:
     Pin `tap`, prioritizing its formulae over core when formula names are supplied
@@ -914,7 +914,7 @@ scripts that reside somewhere in the `PATH`, named `brew-``cmdname` or
 to create your own commands without modifying Homebrew's internals.
 
 Instructions for creating your own commands can be found in the docs:
-<https://docs.brew.sh/External-Commands.html>
+<https://docs.brew.sh/External-Commands>
 
 ## SPECIFYING FORMULAE
 
@@ -1031,7 +1031,7 @@ can take several different forms:
     *Default:* the number of available CPU cores.
 
   * `HOMEBREW_NO_ANALYTICS`:
-    If set, Homebrew will not send analytics. See: <https://docs.brew.sh/Analytics.html>
+    If set, Homebrew will not send analytics. See: <https://docs.brew.sh/Analytics>
 
   * `HOMEBREW_NO_AUTO_UPDATE`:
     If set, Homebrew will not auto-update before running `brew install`,
diff --git a/docs/New-Maintainer-Checklist.md b/docs/New-Maintainer-Checklist.md
index 72abf2ddb8..cb4919d697 100644
--- a/docs/New-Maintainer-Checklist.md
+++ b/docs/New-Maintainer-Checklist.md
@@ -39,8 +39,8 @@ A few requests:
   own fork.
 - if still in doubt please ask for help and we'll help you out
 - please read:
-    - https://docs.brew.sh/Brew-Test-Bot-For-Core-Contributors.html
-    - https://docs.brew.sh/Maintainer-Guidelines.html
+    - https://docs.brew.sh/Brew-Test-Bot-For-Core-Contributors
+    - https://docs.brew.sh/Maintainer-Guidelines
     - anything else you haven't read on https://docs.brew.sh
 
 How does that sound?
diff --git a/docs/_config.yml b/docs/_config.yml
index 210d0b0d40..d535e7bd39 100644
--- a/docs/_config.yml
+++ b/docs/_config.yml
@@ -1,17 +1,31 @@
-include: [.well-known]
-exclude: [bin, vendor, CNAME, Gemfile, Gemfile.lock]
+title: Homebrew Documentation
+description: Documentation for the missing package manager for macOS.
 
-# Same as GitHub Pages
-# https://help.github.com/articles/using-jekyll-with-pages#troubleshooting
-# Disable despite enabled on GitHub Pages for supported plugins to work.
-# safe: true
-kramdown:
-  input: GFM
-  hard_wrap: false
-lsi: false
-highlighter: rouge
+exclude:
+  - bin
+  - CNAME
+  - Gemfile*
+  - README.md
+  - vendor
 
-gems:
+plugins:
   - jekyll-feed
   - jekyll-sitemap
   - jekyll-seo-tag
+
+defaults:
+  - scope:
+      path: ""
+    values:
+      image: /img/homebrew-256x256.png
+
+logo: /img/homebrew-256x256.png
+
+github:
+  repository_nwo: Homebrew/brew
+
+twitter:
+  username: MacHomebrew
+
+facebook:
+  publisher: https://www.facebook.com/machomebrew/
diff --git a/docs/_layouts/base.html b/docs/_layouts/base.html
index ee631bda54..422e98bed8 100644
--- a/docs/_layouts/base.html
+++ b/docs/_layouts/base.html
@@ -1,21 +1,29 @@
+{% assign t = site.data.locales[page.lang][page.lang] %}
 <!DOCTYPE html>
 <html {% if page.direction == "rtl" %}dir="rtl" {% endif %}lang="{{ page.lang }}">
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     {% if page.title %}
-    <title>{{ page.title }} — Homebrew</title>
-    {% elsif page.direction == "rtl" %}
-    <title>{{ page.subtitle }} — Homebrew</title>
+    <title>{{ page.title }} — {{ site.title }}</title>
+    {% elsif t.subtitle %}
+    {% if page.direction == "rtl" %}
+    <title>{{ site.title }} — {{ t.subtitle }}</title>
     {% else %}
-    <title>Homebrew — {{ page.subtitle }}</title>
+    <title>{{ t.subtitle }} — {{ t.subtitle }}</title>
+    {% endif %}
+    {% else %}
+    <title>{{ site.title }}</title>
     {% endif %}
     {% seo title=false %}
     {% feed_meta %}
     <meta name="viewport" content="width=device-width">
     <link rel="icon" type="image/x-icon" href="/img/favicon.ico">
-    <link rel="apple-touch-icon"href="/img/apple-touch-icon.png">
+    <link rel="apple-touch-icon" href="/img/apple-touch-icon.png">
     <link rel="stylesheet" href="/css/screen.css" type="text/css" media="screen">
     <link rel="stylesheet" href="/css/pygments.css" type="text/css" media="screen">
+    {% if site.url == "http://localhost:4000" %}
+    <script src="https://github.com/Khan/tota11y/releases/download/0.1.3/tota11y.min.js"></script>
+    {% endif %}
     <script>
       (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
       (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
@@ -27,31 +35,37 @@
       ga('send', 'pageview');
 
     </script>
-    {% for lang in site.langs %}
-      {% if lang.langcode == "en" %}
+    {% if site.data.locales %}
+    {% assign locales = site.data.locales | sort %}
+    {% for locale in locales %}
+      {% assign lang = locale[0] %}
+      {% if lang == "en" %}
       <link rel="alternate" hreflang="en" href="{{ site.url }}" />
       <link rel="alternate" hreflang="x-default" href="{{ site.url }}" />
       {% else %}
-      <link rel="alternate" hreflang="{{ lang.langcode }}" href="{{ lang.langcode | downcase | append: '.html' | prepend: '/index_' | prepend: site.url }}" />
+      <link rel="alternate" hreflang="{{ lang }}" href="{{ lang | prepend: '/index_' | prepend: site.url }}" />
       {% endif %}
     {% endfor %}
+    {% endif %}
   </head>
   <body>
     <div id="wrap">
       <div id="header" class="{{ page.header-class }}">
         <img alt="Homebrew logo" src="/img/homebrew-256x256.png" width="128" height="128">
         <h1><a href="/">Homebrew</a></h1>
-        {% if page.subtitle %}
-        <p id="subtitle"><strong>{{ page.subtitle }}</strong></p>
+        {% if t.subtitle %}
+        <p id="subtitle"><strong>{{ t.subtitle }}</strong></p>
         {% endif %}
 
         {% if page.lang %}
         <select id="language" onchange="loadLanguage(this.options[this.selectedIndex].value)">
-          {% for lang in site.langs %}
-            {% if page.lang == lang.langcode %}
-            <option value="{{ lang.langcode | downcase }}" selected="selected">{{ lang.lang_string }}</option>
+          {% for locale in locales %}
+            {% assign lang = locale[0] %}
+            {% assign locale_name = locale[1][lang].locale_name %}
+            {% if page.lang == lang %}
+            <option value="{{ lang }}" selected="selected">{{ locale_name }}</option>
             {% else %}
-            <option value="{{ lang.langcode | downcase }}">{{ lang.lang_string }}</option>
+            <option value="{{ lang }}">{{ locale_name }}</option>
             {% endif %}
           {% endfor %}
         </select>
@@ -80,9 +94,9 @@
         if (lang === {{ page.lang | jsonify }}) {
             return;
         } else if (lang === "en") {
-            window.location.replace("/");
+            window.location.assign("/");
         } else {
-            window.location.replace("/index_" + lang + ".html");
+            window.location.assign("/index_" + lang);
         }
       }
     </script>

From 5b35ba619146d1fa55259d4e86399c4f35dece09 Mon Sep 17 00:00:00 2001
From: Mike McQuaid <mike@mikemcquaid.com>
Date: Thu, 22 Feb 2018 18:57:24 +0000
Subject: [PATCH 52/69] docs/config.yml: generate README.md again.

This is the index.
---
 docs/_config.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/docs/_config.yml b/docs/_config.yml
index d535e7bd39..d9514116e0 100644
--- a/docs/_config.yml
+++ b/docs/_config.yml
@@ -5,7 +5,6 @@ exclude:
   - bin
   - CNAME
   - Gemfile*
-  - README.md
   - vendor
 
 plugins:

From e63a2ee8de12f0f938f6a95cdb9763dbe0187b4a Mon Sep 17 00:00:00 2001
From: Mike McQuaid <mike@mikemcquaid.com>
Date: Thu, 22 Feb 2018 19:25:44 +0000
Subject: [PATCH 53/69] docs: use short links.

---
 docs/Acceptable-Formulae.md                   |  8 +-
 docs/Bottles.md                               |  2 +-
 docs/Brew-Test-Bot-For-Core-Contributors.md   |  2 +-
 ...lding-Against-Non-Homebrew-Dependencies.md |  2 +-
 docs/Common-Issues.md                         |  2 +-
 docs/External-Commands.md                     |  2 +-
 docs/FAQ.md                                   |  8 +-
 docs/Formula-Cookbook.md                      |  8 +-
 docs/Homebrew-and-Python.md                   |  4 +-
 docs/How-To-Open-a-Homebrew-Pull-Request.md   |  2 +-
 docs/How-to-Create-and-Maintain-a-Tap.md      |  4 +-
 ...rew-with-Homebrew-keg-only-dependencies.md |  2 +-
 docs/Installation.md                          |  6 +-
 docs/Maintainer-Guidelines.md                 |  6 +-
 docs/New-Maintainer-Checklist.md              |  2 +-
 docs/Node-for-Formula-Authors.md              |  2 +-
 docs/README.md                                | 74 +++++++++----------
 docs/Tips-N'-Tricks.md                        |  2 +-
 docs/Troubleshooting.md                       |  2 +-
 docs/Versions.md                              |  2 +-
 20 files changed, 71 insertions(+), 71 deletions(-)

diff --git a/docs/Acceptable-Formulae.md b/docs/Acceptable-Formulae.md
index df799bb1a7..1530238c54 100644
--- a/docs/Acceptable-Formulae.md
+++ b/docs/Acceptable-Formulae.md
@@ -2,14 +2,14 @@
 
 Some formulae should not go in
 [homebrew/core](https://github.com/Homebrew/homebrew-core). But there are
-additional [Interesting Taps and Forks](Interesting-Taps-and-Forks.md) and anyone can start their
+additional [Interesting Taps and Forks](Interesting-Taps-and-Forks) and anyone can start their
 own!
 
 ### Dupes in `homebrew/core`
 We now accept stuff that comes with macOS as long as it uses `keg_only :provided_by_macos` to be keg-only by default.
 
 ### Versioned formulae in `homebrew/core`
-We now accept versioned formulae as long as they [meet the requirements](Versions.md).
+We now accept versioned formulae as long as they [meet the requirements](Versions).
 
 ### We don’t like tools that upgrade themselves
 Software that can upgrade itself does not integrate well with Homebrew's own
@@ -36,7 +36,7 @@ the upstream project. Tarballs are preferred to Git checkouts, and
 tarballs should include the version in the filename whenever possible.
 
 We don’t accept software without a tagged version because they regularly break
-due to upstream changes and we can’t provide [bottles](Bottles.md) for them.
+due to upstream changes and we can’t provide [bottles](Bottles) for them.
 
 ### Bindings
 First check that there is not already a binding available via
@@ -62,7 +62,7 @@ get maintained and partly because we have to draw the line somewhere.
 We frown on authors submitting their own work unless it is very popular.
 
 Don’t forget Homebrew is all Git underneath!
-[Maintain your own tap](How-to-Create-and-Maintain-a-Tap.md) if you have to!
+[Maintain your own tap](How-to-Create-and-Maintain-a-Tap) if you have to!
 
 There may be exceptions to these rules in the main repository; we may
 include things that don't meet these criteria or reject things that do.
diff --git a/docs/Bottles.md b/docs/Bottles.md
index 426b9e91c4..b216b2731a 100644
--- a/docs/Bottles.md
+++ b/docs/Bottles.md
@@ -8,7 +8,7 @@ If a bottle is available and usable it will be downloaded and poured automatical
 Bottles will not be used if the user requests it (see above), if the formula requests it (with `pour_bottle?`), if any options are specified during installation (bottles are all compiled with default options), if the bottle is not up to date (e.g. lacking a checksum) or if the bottle's `cellar` is not `:any` nor equal to the current `HOMEBREW_CELLAR`.
 
 ## Creation
-Bottles are created using the [Brew Test Bot](Brew-Test-Bot.md). This happens mostly when people submit pull requests to Homebrew and the `bottle do` block is updated by maintainers when they `brew pull --bottle` the contents of a pull request. For the Homebrew organisations' taps they are uploaded to and downloaded from [Bintray](https://bintray.com/homebrew).
+Bottles are created using the [Brew Test Bot](Brew-Test-Bot). This happens mostly when people submit pull requests to Homebrew and the `bottle do` block is updated by maintainers when they `brew pull --bottle` the contents of a pull request. For the Homebrew organisations' taps they are uploaded to and downloaded from [Bintray](https://bintray.com/homebrew).
 
 By default, bottles will be built for the oldest CPU supported by the OS/architecture you're building for. (That's Core 2 for 64-bit OSs, Core for 32-bit.) This ensures that bottles are compatible with all computers you might distribute them to. If you *really* want your bottles to be optimized for something else, you can pass the `--bottle-arch=` option to build for another architecture - for example, `brew install foo --bottle-arch=penryn`. Just remember that if you build for a newer architecture some of your users might get binaries they can't run and that would be sad!
 
diff --git a/docs/Brew-Test-Bot-For-Core-Contributors.md b/docs/Brew-Test-Bot-For-Core-Contributors.md
index 8df0a28350..939e6e9bde 100644
--- a/docs/Brew-Test-Bot-For-Core-Contributors.md
+++ b/docs/Brew-Test-Bot-For-Core-Contributors.md
@@ -5,7 +5,7 @@ If a build has run and passed on `brew test-bot` then it can be used to quickly
 There are two types of Jenkins jobs you will interact with:
 
 ## [Homebrew Core Pull Requests](https://jenkins.brew.sh/job/Homebrew%20Core/)
-This job automatically builds any pull requests submitted to Homebrew/homebrew-core. On success or failure it updates the pull request status (see more details on the [main Brew Test Bot documentation page](Brew-Test-Bot.md)). On a successful build it automatically uploads bottles.
+This job automatically builds any pull requests submitted to Homebrew/homebrew-core. On success or failure it updates the pull request status (see more details on the [main Brew Test Bot documentation page](Brew-Test-Bot)). On a successful build it automatically uploads bottles.
 
 ## [Homebrew Testing](https://jenkins.brew.sh/job/Homebrew%20Testing/)
 This job is manually triggered to run [`brew test-bot`](https://github.com/Homebrew/homebrew-test-bot/blob/master/cmd/brew-test-bot.rb) with user-specified parameters. On a successful build it automatically uploads bottles.
diff --git a/docs/Building-Against-Non-Homebrew-Dependencies.md b/docs/Building-Against-Non-Homebrew-Dependencies.md
index 4e85757a1b..0c8ad98028 100644
--- a/docs/Building-Against-Non-Homebrew-Dependencies.md
+++ b/docs/Building-Against-Non-Homebrew-Dependencies.md
@@ -8,4 +8,4 @@ As Homebrew became primarily a binary package manager, most users were fulfillin
 
 ## Today
 
-If you wish to build against custom non-Homebrew dependencies that are provided by Homebrew (e.g. a non-Homebrew, non-macOS `ruby`) then you must [create and maintain your own tap](How-to-Create-and-Maintain-a-Tap.md) as these formulae will not be accepted in Homebrew/homebrew-core. Once you have done that you can specify `env :std` in the formula which will allow a e.g. `which ruby` to access your existing `PATH` variable and allow compilation to link against this Ruby.
+If you wish to build against custom non-Homebrew dependencies that are provided by Homebrew (e.g. a non-Homebrew, non-macOS `ruby`) then you must [create and maintain your own tap](How-to-Create-and-Maintain-a-Tap) as these formulae will not be accepted in Homebrew/homebrew-core. Once you have done that you can specify `env :std` in the formula which will allow a e.g. `which ruby` to access your existing `PATH` variable and allow compilation to link against this Ruby.
diff --git a/docs/Common-Issues.md b/docs/Common-Issues.md
index a3a31ce80b..8960720681 100644
--- a/docs/Common-Issues.md
+++ b/docs/Common-Issues.md
@@ -121,7 +121,7 @@ To list all files that would be deleted:
 
 Don't follow the advice here but fix by using
 `Language::Python.setup_install_args` in the formula as described in
-[Python for Formula Authors](Python-for-Formula-Authors.md).
+[Python for Formula Authors](Python-for-Formula-Authors).
 
 ### Upgrading macOS
 
diff --git a/docs/External-Commands.md b/docs/External-Commands.md
index 65282fcb16..9b03f04228 100644
--- a/docs/External-Commands.md
+++ b/docs/External-Commands.md
@@ -44,7 +44,7 @@ Note they are largely untested, and as always, be careful about running untested
 
 ### brew-livecheck
 Check if there is a new upstream version of a formula.
-See the [`README`](https://github.com/Homebrew/homebrew-livecheck/blob/master/README.md) for more info and usage.
+See the [`README`](https://github.com/Homebrew/homebrew-livecheck/blob/master/README) for more info and usage.
 
 Install using:
 
diff --git a/docs/FAQ.md b/docs/FAQ.md
index 9d76bf4ab6..b455ca5f78 100644
--- a/docs/FAQ.md
+++ b/docs/FAQ.md
@@ -76,11 +76,11 @@ the launchctl PATH for _all users_. For earlier versions of macOS, see
 [this page](https://developer.apple.com/legacy/library/qa/qa1067/_index.html).
 
 ## How do I contribute to Homebrew?
-Read [CONTRIBUTING.md](https://github.com/Homebrew/brew/blob/master/CONTRIBUTING.md).
+Read [CONTRIBUTING.md](https://github.com/Homebrew/brew/blob/master/CONTRIBUTING).
 
 ## Why do you compile everything?
 Homebrew provides pre-compiled versions for many formulae. These
-pre-compiled versions are referred to as [bottles](Bottles.md) and are available
+pre-compiled versions are referred to as [bottles](Bottles) and are available
 at <https://bintray.com/homebrew/bottles>.
 
 If available, bottled binaries will be used by default except under the
@@ -163,7 +163,7 @@ creating a separate user account especially for use of Homebrew.
 
 ## Why isn’t a particular command documented?
 
-If it’s not in `man brew`, it’s probably an external command. These are documented [here](External-Commands.md).
+If it’s not in `man brew`, it’s probably an external command. These are documented [here](External-Commands).
 
 ## Why haven’t you pulled my pull request?
 If it’s been a while, bump it with a “bump” comment. Sometimes we miss requests and there are plenty of them. Maybe we were thinking on something. It will encourage consideration. In the meantime if you could rebase the pull request so that it can be cherry-picked more easily we will love you for a long time.
@@ -179,7 +179,7 @@ install <formula>`. If you encounter any issues, run the command with the
 into a debugging shell.
 
 If you want your new formula to be part of `homebrew/core` or want
-to learn more about writing formulae, then please read the [Formula Cookbook](Formula-Cookbook.md).
+to learn more about writing formulae, then please read the [Formula Cookbook](Formula-Cookbook).
 
 ## Can I install my own stuff to `/usr/local`?
 Yes, `brew` is designed to not get in your way so you can use it how you
diff --git a/docs/Formula-Cookbook.md b/docs/Formula-Cookbook.md
index 1f2b2e89e2..f977a8ef00 100644
--- a/docs/Formula-Cookbook.md
+++ b/docs/Formula-Cookbook.md
@@ -29,7 +29,7 @@ Make sure you run `brew update` before you start. This turns your Homebrew insta
 
 Before submitting a new formula make sure your package:
 
-*   meets all our [Acceptable Formulae](Acceptable-Formulae.md) requirements
+*   meets all our [Acceptable Formulae](Acceptable-Formulae) requirements
 *   isn't already in Homebrew (check `brew search <formula>`)
 *   isn't in another official [Homebrew tap](https://github.com/Homebrew)
 *   isn't already waiting to be merged (check the [issue tracker](https://github.com/Homebrew/homebrew-core/pulls))
@@ -37,7 +37,7 @@ Before submitting a new formula make sure your package:
 *   has a stable, tagged version (i.e. not just a GitHub repository with no versions)
 *   passes all `brew audit --new-formula <formula>` tests.
 
-Before submitting a new formula make sure you read over our [contribution guidelines](https://github.com/Homebrew/brew/blob/master/CONTRIBUTING.md).
+Before submitting a new formula make sure you read over our [contribution guidelines](https://github.com/Homebrew/brew/blob/master/CONTRIBUTING).
 
 ### Grab the URL
 
@@ -251,7 +251,7 @@ Check the top of the e.g. `./configure` output. Some configure scripts do not re
 
 ### Add a test to the formula
 
-Add a valid test to the [`test do`](http://www.rubydoc.info/github/Homebrew/brew/master/Formula&num;test-class_method) block of the formula. This will be run by `brew test foo` and the [Brew Test Bot](Brew-Test-Bot.md).
+Add a valid test to the [`test do`](http://www.rubydoc.info/github/Homebrew/brew/master/Formula&num;test-class_method) block of the formula. This will be run by `brew test foo` and the [Brew Test Bot](Brew-Test-Bot).
 
 The
 [`test do`](http://www.rubydoc.info/github/Homebrew/brew/master/Formula#test-class_method)
@@ -534,7 +534,7 @@ end
 
 ### Compiler selection
 
-Sometimes a package fails to build when using a certain compiler. Since recent [Xcode versions](Xcode.md) no longer include a GCC compiler we cannot simply force the use of GCC. Instead, the correct way to declare this is the [`fails_with` DSL method](http://www.rubydoc.info/github/Homebrew/brew/master/Formula#fails_with-class_method). A properly constructed [`fails_with`](http://www.rubydoc.info/github/Homebrew/brew/master/Formula#fails_with-class_method) block documents the latest compiler build version known to cause compilation to fail, and the cause of the failure. For example:
+Sometimes a package fails to build when using a certain compiler. Since recent [Xcode versions](Xcode) no longer include a GCC compiler we cannot simply force the use of GCC. Instead, the correct way to declare this is the [`fails_with` DSL method](http://www.rubydoc.info/github/Homebrew/brew/master/Formula#fails_with-class_method). A properly constructed [`fails_with`](http://www.rubydoc.info/github/Homebrew/brew/master/Formula#fails_with-class_method) block documents the latest compiler build version known to cause compilation to fail, and the cause of the failure. For example:
 
 ```ruby
 fails_with :clang do
diff --git a/docs/Homebrew-and-Python.md b/docs/Homebrew-and-Python.md
index eb96e57583..72bc7d7f7f 100644
--- a/docs/Homebrew-and-Python.md
+++ b/docs/Homebrew-and-Python.md
@@ -1,6 +1,6 @@
 # Python
 
-This page describes how Python is handled in Homebrew for users. See [Python for Formula Authors](Python-for-Formula-Authors.md) for advice on writing formulae to install packages written in Python.
+This page describes how Python is handled in Homebrew for users. See [Python for Formula Authors](Python-for-Formula-Authors) for advice on writing formulae to install packages written in Python.
 
 Homebrew should work with any [CPython](https://stackoverflow.com/questions/2324208/is-there-any-difference-between-cpython-and-python) and defaults to the macOS system Python.
 
@@ -66,7 +66,7 @@ Some formulae provide Python bindings. Sometimes a `--with-python` or `--with-py
 
 Homebrew builds bindings against the first `python` (and `python-config`) in your `PATH`. (Check with `which python`).
 
-**Warning!** Python may crash (see [Common Issues](Common-Issues.md)) if you `import <module>` from a brewed Python if you ran `brew install <formula_with_python_bindings>` against the system Python. If you decide to switch to the brewed Python, then reinstall all formulae with Python bindings (e.g. `pyside`, `wxwidgets`, `pygtk`, `pygobject`, `opencv`, `vtk` and `boost-python`).
+**Warning!** Python may crash (see [Common Issues](Common-Issues)) if you `import <module>` from a brewed Python if you ran `brew install <formula_with_python_bindings>` against the system Python. If you decide to switch to the brewed Python, then reinstall all formulae with Python bindings (e.g. `pyside`, `wxwidgets`, `pygtk`, `pygobject`, `opencv`, `vtk` and `boost-python`).
 
 ## Policy for non-brewed Python bindings
 These should be installed via `pip install <package>`. To discover, you can use `pip search` or <https://pypi.python.org/pypi>. (**Note:** System Python does not provide `pip`. Follow the [pip documentation](https://pip.readthedocs.io/en/stable/installing/#install-pip) to install it for your system Python if you would like it.)
diff --git a/docs/How-To-Open-a-Homebrew-Pull-Request.md b/docs/How-To-Open-a-Homebrew-Pull-Request.md
index 812d990e08..979a031a54 100644
--- a/docs/How-To-Open-a-Homebrew-Pull-Request.md
+++ b/docs/How-To-Open-a-Homebrew-Pull-Request.md
@@ -34,7 +34,7 @@ To make a new branch and submit it for review, create a GitHub pull request with
 1. Check out the `master` branch with `git checkout master`.
 2. Retrieve new changes to the `master` branch with `brew update`.
 3. Create a new branch from the latest `master` branch with `git checkout -b <YOUR_BRANCH_NAME> origin/master`.
-4. Make your changes. For formulae, use `brew edit` or your favorite text editor, following all the guidelines in the [Formula Cookbook](Formula-Cookbook.md).
+4. Make your changes. For formulae, use `brew edit` or your favorite text editor, following all the guidelines in the [Formula Cookbook](Formula-Cookbook).
   * If there's a `bottle do` block in the formula, don't remove or change it; we'll update it when we pull your PR.
 5. Test your changes by doing the following, and ensure they all pass without issue. For changed formulae, make sure you do the `brew audit` step while your changed formula is installed.
   * `brew tests`
diff --git a/docs/How-to-Create-and-Maintain-a-Tap.md b/docs/How-to-Create-and-Maintain-a-Tap.md
index 610380aa60..c3296c55d2 100644
--- a/docs/How-to-Create-and-Maintain-a-Tap.md
+++ b/docs/How-to-Create-and-Maintain-a-Tap.md
@@ -27,7 +27,7 @@ If it’s on GitHub, users can install any of your formulae with
 file here.
 
 If they want to get your tap without installing any formula at the same time,
-users can add it with the [`brew tap` command](Taps.md).
+users can add it with the [`brew tap` command](Taps).
 
 If it’s on GitHub, they can use `brew tap user/repo`, where `user` is your
 GitHub username and `homebrew-repo` your repository.
@@ -51,7 +51,7 @@ Once your tap is installed, Homebrew will update it each time a user runs
 
 ## External commands
 You can provide your tap users with custom `brew` commands by adding them in a
-`cmd` subdirectory. [Read more on external commands](External-Commands.md).
+`cmd` subdirectory. [Read more on external commands](External-Commands).
 
 See [homebrew/aliases](https://github.com/Homebrew/homebrew-aliases) for an
 example of a tap with external commands.
diff --git a/docs/How-to-build-software-outside-Homebrew-with-Homebrew-keg-only-dependencies.md b/docs/How-to-build-software-outside-Homebrew-with-Homebrew-keg-only-dependencies.md
index 1384ce9508..e40b04abce 100644
--- a/docs/How-to-build-software-outside-Homebrew-with-Homebrew-keg-only-dependencies.md
+++ b/docs/How-to-build-software-outside-Homebrew-with-Homebrew-keg-only-dependencies.md
@@ -2,7 +2,7 @@
 
 ## What does "keg-only" mean?
 
-The [FAQ](FAQ.md) briefly explains this.
+The [FAQ](FAQ) briefly explains this.
 
 As an example:
 
diff --git a/docs/Installation.md b/docs/Installation.md
index 9f091d2e58..5d2eee6d92 100644
--- a/docs/Installation.md
+++ b/docs/Installation.md
@@ -4,7 +4,7 @@ The suggested and easiest way to install Homebrew is on the
 [homepage](https://brew.sh).
 
 The standard script installs Homebrew to `/usr/local` so that
-[you don’t need sudo](FAQ.md) when you
+[you don’t need sudo](FAQ) when you
 `brew install`. It is a careful script; it can be run even if you have stuff
 installed to `/usr/local` already. It tells you exactly what it will do before
 it does it too. And you have to confirm everything it will do before it starts.
@@ -39,12 +39,12 @@ mkdir homebrew && curl -L https://github.com/Homebrew/brew/tarball/master | tar
 Create a Homebrew installation wherever you extract the tarball. Whichever `brew` command is called is where the packages will be installed. You can use this as you see fit, e.g. a system set of libs in `/usr/local` and tweaked formulae for development in `~/homebrew`.
 
 ## Uninstallation
-Uninstallation is documented in the [FAQ](FAQ.md).
+Uninstallation is documented in the [FAQ](FAQ).
 
 <a name="1"><sup>1</sup></a> Not all formulae have CPU or OS requirements, but
 you can assume you will have trouble if you don’t conform. Also, you can find
 PowerPC and Tiger branches from other users in the fork network. See
-[Interesting Taps and Forks](Interesting-Taps-and-Forks.md).
+[Interesting Taps and Forks](Interesting-Taps-and-Forks).
 
 <a name="2"><sup>2</sup></a> 10.10 or higher is recommended. 10.5–10.9 are
 supported on a best-effort basis. For 10.4 see
diff --git a/docs/Maintainer-Guidelines.md b/docs/Maintainer-Guidelines.md
index 1d69f53811..9d8b4bbdfd 100644
--- a/docs/Maintainer-Guidelines.md
+++ b/docs/Maintainer-Guidelines.md
@@ -5,7 +5,7 @@ access** to Homebrew’s repository and help merge the contributions of
 others. You may find what is written here interesting, but it’s
 definitely not a beginner’s guide.
 
-Maybe you were looking for the [Formula Cookbook](Formula-Cookbook.md)?
+Maybe you were looking for the [Formula Cookbook](Formula-Cookbook)?
 
 ## Quick checklist
 
@@ -45,7 +45,7 @@ Add other names as aliases as symlinks in `Aliases` in the tap root. Ensure the
 name referenced on the homepage is one of these, as it may be different and have
 underscores and hyphens and so on.
 
-We now accept versioned formulae as long as they [meet the requirements](Versions.md).
+We now accept versioned formulae as long as they [meet the requirements](Versions).
 
 ### Merging, rebasing, cherry-picking
 Merging should be done in the `Homebrew/brew` repository to preserve history & GPG commit signing,
@@ -64,7 +64,7 @@ the commits. Our main branch history should be useful to other people,
 not confusing.
 
 ### Testing
-We need to at least check that it builds. Use the [Brew Test Bot](Brew-Test-Bot.md) for this.
+We need to at least check that it builds. Use the [Brew Test Bot](Brew-Test-Bot) for this.
 
 Verify the formula works if possible. If you can’t tell (e.g. if it’s a
 library) trust the original contributor, it worked for them, so chances are it
diff --git a/docs/New-Maintainer-Checklist.md b/docs/New-Maintainer-Checklist.md
index cb4919d697..d081131566 100644
--- a/docs/New-Maintainer-Checklist.md
+++ b/docs/New-Maintainer-Checklist.md
@@ -59,6 +59,6 @@ If they accept, follow a few steps to get them set up:
 - Invite them to the [`homebrew` private maintainers 1Password](https://homebrew.1password.com/signin)
 - Invite them to [Google Analytics](https://analytics.google.com/analytics/web/?authuser=1#management/Settings/a76679469w115400090p120682403/%3Fm.page%3DAccountUsers/)
 
-After a month-long trial period with no problems make them [owners on the Homebrew GitHub organisation](https://github.com/orgs/Homebrew/people) and add them to [Homebrew's README](https://github.com/Homebrew/brew/edit/master/README.md). If there are problems, ask them to step down as a maintainer and revoke their access to the above.
+After a month-long trial period with no problems make them [owners on the Homebrew GitHub organisation](https://github.com/orgs/Homebrew/people) and add them to [Homebrew's README](https://github.com/Homebrew/brew/edit/master/README). If there are problems, ask them to step down as a maintainer and revoke their access to the above.
 
 Now sit back, relax and let the new maintainers handle more of our contributions.
diff --git a/docs/Node-for-Formula-Authors.md b/docs/Node-for-Formula-Authors.md
index 4053706c16..9252602ed8 100644
--- a/docs/Node-for-Formula-Authors.md
+++ b/docs/Node-for-Formula-Authors.md
@@ -82,7 +82,7 @@ In your formula's `install` method, do any installation steps which need to be d
 system "npm", "install", *Language::Node.local_npm_install_args
 ```
 
-This will install all of your Node modules dependencies to your local build path. You can now continue with your build steps and take care of the installation into the Homebrew `prefix` on your own, following the [general Homebrew formula instructions](Formula-Cookbook.md).
+This will install all of your Node modules dependencies to your local build path. You can now continue with your build steps and take care of the installation into the Homebrew `prefix` on your own, following the [general Homebrew formula instructions](Formula-Cookbook).
 
 ## Example
 
diff --git a/docs/README.md b/docs/README.md
index fe227291bb..5e90fe95a5 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -1,46 +1,46 @@
 # Documentation
 
 ## Users
-- [`brew` man-page (command documentation)](Manpage.md)
-- [Troubleshooting](Troubleshooting.md)
-- [Installation](Installation.md)
-- [Frequently Asked Questions](FAQ.md)
-- [Common Issues](Common-Issues.md)
+- [`brew` man-page (command documentation)](Manpage)
+- [Troubleshooting](Troubleshooting)
+- [Installation](Installation)
+- [Frequently Asked Questions](FAQ)
+- [Common Issues](Common-Issues)
 
-- [Tips and Tricks](Tips-N'-Tricks.md)
-- [Bottles (binary packages)](Bottles.md)
-- [Taps (third-party repositories)](Taps.md)
-- [Interesting Taps and Forks](Interesting-Taps-and-Forks.md)
-- [Anonymous Aggregate User Behaviour Analytics](Analytics.md)
+- [Tips and Tricks](Tips-N'-Tricks)
+- [Bottles (binary packages)](Bottles)
+- [Taps (third-party repositories)](Taps)
+- [Interesting Taps and Forks](Interesting-Taps-and-Forks)
+- [Anonymous Aggregate User Behaviour Analytics](Analytics)
 
-- [Querying `brew`](Querying-Brew.md)
-- [C++ Standard Libraries](C++-Standard-Libraries.md)
-- [MD5 and SHA-1 Deprecation](Checksum_Deprecation.md)
-- [Custom GCC and Cross Compilers](Custom-GCC-and-cross-compilers.md)
-- [External Commands](External-Commands.md)
-- [Ruby Gems, Python Eggs and Perl Modules](Gems,-Eggs-and-Perl-Modules.md)
-- [Python](Homebrew-and-Python.md)
-- [How To Build Software Outside Homebrew With Homebrew `keg_only` dependencies](How-to-build-software-outside-Homebrew-with-Homebrew-keg-only-dependencies.md)
-- [Xcode](Xcode.md)
-- [Kickstarter Supporters](Kickstarter-Supporters.md)
+- [Querying `brew`](Querying-Brew)
+- [C++ Standard Libraries](C++-Standard-Libraries)
+- [MD5 and SHA-1 Deprecation](Checksum_Deprecation)
+- [Custom GCC and Cross Compilers](Custom-GCC-and-cross-compilers)
+- [External Commands](External-Commands)
+- [Ruby Gems, Python Eggs and Perl Modules](Gems,-Eggs-and-Perl-Modules)
+- [Python](Homebrew-and-Python)
+- [How To Build Software Outside Homebrew With Homebrew `keg_only` dependencies](How-to-build-software-outside-Homebrew-with-Homebrew-keg-only-dependencies)
+- [Xcode](Xcode)
+- [Kickstarter Supporters](Kickstarter-Supporters)
 
 ## Contributors
-- [How To Open A Pull Request (and get it merged)](How-To-Open-a-Homebrew-Pull-Request.md)
-- [Formula Cookbook](Formula-Cookbook.md)
-- [Acceptable Formulae](Acceptable-Formulae.md)
-- [Formulae Versions](Versions.md)
-- [Node for Formula Authors](Node-for-Formula-Authors.md)
-- [Python for Formula Authors](Python-for-Formula-Authors.md)
-- [Migrating A Formula To A Tap](Migrating-A-Formula-To-A-Tap.md)
-- [Rename A Formula](Rename-A-Formula.md)
-- [Building Against Non-Homebrew Dependencies](Building-Against-Non-Homebrew-Dependencies.md)
-- [How To Create (And Maintain) A Tap](How-to-Create-and-Maintain-a-Tap.md)
-- [Brew Test Bot](Brew-Test-Bot.md)
-- [Prose Style Guidelines](Prose-Style-Guidelines.md)
+- [How To Open A Pull Request (and get it merged)](How-To-Open-a-Homebrew-Pull-Request)
+- [Formula Cookbook](Formula-Cookbook)
+- [Acceptable Formulae](Acceptable-Formulae)
+- [Formulae Versions](Versions)
+- [Node for Formula Authors](Node-for-Formula-Authors)
+- [Python for Formula Authors](Python-for-Formula-Authors)
+- [Migrating A Formula To A Tap](Migrating-A-Formula-To-A-Tap)
+- [Rename A Formula](Rename-A-Formula)
+- [Building Against Non-Homebrew Dependencies](Building-Against-Non-Homebrew-Dependencies)
+- [How To Create (And Maintain) A Tap](How-to-Create-and-Maintain-a-Tap)
+- [Brew Test Bot](Brew-Test-Bot)
+- [Prose Style Guidelines](Prose-Style-Guidelines)
 
 ## Maintainers
-- [New Maintainer Checklist](New-Maintainer-Checklist.md)
-- [Maintainers: Avoiding Burnout](Maintainers-Avoiding-Burnout.md)
-- [Maintainer Guidelines](Maintainer-Guidelines.md)
-- [Brew Test Bot For Maintainers](Brew-Test-Bot-For-Core-Contributors.md)
-- [Common Issues for Maintainers](Common-Issues-for-Core-Contributors.md)
+- [New Maintainer Checklist](New-Maintainer-Checklist)
+- [Maintainers: Avoiding Burnout](Maintainers-Avoiding-Burnout)
+- [Maintainer Guidelines](Maintainer-Guidelines)
+- [Brew Test Bot For Maintainers](Brew-Test-Bot-For-Core-Contributors)
+- [Common Issues for Maintainers](Common-Issues-for-Core-Contributors)
diff --git a/docs/Tips-N'-Tricks.md b/docs/Tips-N'-Tricks.md
index a88940f0ef..a71a2ed372 100644
--- a/docs/Tips-N'-Tricks.md
+++ b/docs/Tips-N'-Tricks.md
@@ -3,7 +3,7 @@
 ## Installing previous versions of formulae
 
 The supported method of installing specific versions of
-some formulae is to see if there is a versioned formula (e.g. `gcc@6`) available. If the version you’re looking for isn’t available, consider [opening a pull request](How-To-Open-a-Homebrew-Pull-Request.md)!
+some formulae is to see if there is a versioned formula (e.g. `gcc@6`) available. If the version you’re looking for isn’t available, consider [opening a pull request](How-To-Open-a-Homebrew-Pull-Request)!
 
 ### Installing directly from pull requests
 You can [browse pull requests](https://github.com/Homebrew/homebrew-core/pulls)
diff --git a/docs/Troubleshooting.md b/docs/Troubleshooting.md
index 8b1bd73127..1bade44f22 100644
--- a/docs/Troubleshooting.md
+++ b/docs/Troubleshooting.md
@@ -12,7 +12,7 @@ Follow these steps to fix common problems:
 * Run `brew doctor` and fix all the warnings (**outdated Xcode/CLT and unbrewed dylibs are very likely to cause problems**).
 * Check that **Command Line Tools for Xcode (CLT)** and **Xcode** are up to date.
 * If commands fail with permissions errors, check the permissions of `/usr/local`'s subdirectories. If you’re unsure what to do, you can run `cd /usr/local && sudo chown -R $(whoami) bin etc include lib sbin share var Frameworks`.
-* Read through the [Common Issues](Common-Issues.md).
+* Read through the [Common Issues](Common-Issues).
 
 ## Check to see if the issue has been reported
 
diff --git a/docs/Versions.md b/docs/Versions.md
index 2fa3f563f5..43a9595749 100644
--- a/docs/Versions.md
+++ b/docs/Versions.md
@@ -18,6 +18,6 @@ Versioned formulae we include in [homebrew/core](https://github.com/homebrew/hom
 * Versioned formulae should be as similar as possible and sensible to the unversioned formulae. Creating or updating a versioned formula should be a chance to ask questions of the unversioned formula e.g. can some unused or useless options be removed or made default?
 * No more than five versions of a formula (including the non-versioned one) will be supported at any given time, regardless of usage. When removing formulae that violate this we will aim to do so based on usage and support status rather than age.
 
-Homebrew's versions are not intended to be used for any old versions you personally require for your project. You should create your own [tap](How-to-Create-and-Maintain-a-Tap.md) for formulae you or your organisation wish to control the versioning of or those that do not meet the above standards. Software that has regular API or ABI breaking releases still needs to meet all the above requirements; that a `brew upgrade` has broken something for you is not an argument for us to add and maintain a formula for you.
+Homebrew's versions are not intended to be used for any old versions you personally require for your project. You should create your own [tap](How-to-Create-and-Maintain-a-Tap) for formulae you or your organisation wish to control the versioning of or those that do not meet the above standards. Software that has regular API or ABI breaking releases still needs to meet all the above requirements; that a `brew upgrade` has broken something for you is not an argument for us to add and maintain a formula for you.
 
 We may temporarily add versioned formulae for our own needs that do not meet these standards in [homebrew/core](https://github.com/homebrew/homebrew-core). The presence of a versioned formula there does not imply it will be maintained indefinitely or that we are willing to accept any more versions that do not meet the requirements above.

From a1bf2c072c9d2064f304a1294c51b565e8a81853 Mon Sep 17 00:00:00 2001
From: Maxim Belkin <maxim.belkin@gmail.com>
Date: Thu, 22 Feb 2018 19:25:56 +0000
Subject: [PATCH 54/69] Use \d instead of 0-9 in regex

---
 Library/Homebrew/system_config.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Library/Homebrew/system_config.rb b/Library/Homebrew/system_config.rb
index 9a8d1d9d3a..63e162075e 100644
--- a/Library/Homebrew/system_config.rb
+++ b/Library/Homebrew/system_config.rb
@@ -134,7 +134,7 @@ class SystemConfig
       return "N/A" unless which "java"
       java_version = Utils.popen_read("java", "-version")
       return "N/A" unless $CHILD_STATUS.success?
-      java_version[/java version "([0-9\._]+)"/, 1] || "N/A"
+      java_version[/java version "([\d\._]+)"/, 1] || "N/A"
     end
 
     def describe_git

From 35efc5ab23d30361a49a7af5b2319817a001b591 Mon Sep 17 00:00:00 2001
From: Mike McQuaid <mike@mikemcquaid.com>
Date: Thu, 22 Feb 2018 19:44:42 +0000
Subject: [PATCH 55/69] docs: add/update more layouts.

---
 docs/_layouts/analytics.html | 22 ++++++++++++
 docs/_layouts/index.html     | 66 +++++++++++++++++++++++++-----------
 2 files changed, 69 insertions(+), 19 deletions(-)
 create mode 100644 docs/_layouts/analytics.html

diff --git a/docs/_layouts/analytics.html b/docs/_layouts/analytics.html
new file mode 100644
index 0000000000..b62e424c58
--- /dev/null
+++ b/docs/_layouts/analytics.html
@@ -0,0 +1,22 @@
+---
+layout: base
+---
+{% assign json = site.data.analytics[page.category] %}
+<h2>{{ page.category_pretty }} Events</h2>
+<h3>{{ json.start_date }} - {{ json.end_date }}</h3>
+<table class="full-width">
+  <tr>
+    <th></th>
+    <th>{% if page.category == "os-version" %}Version{% else %}Formula{% endif %}</th>
+    <th>Events</th>
+    <th>%</th>
+  </tr>
+{% for item in json.items %}
+  <tr>
+    <td class="number-data">#{{ item.number }}</td>
+    <td><code>{% if page.category == "os-version" %}{{ item.os_version }}{% else %}{{ item.formula }}{% endif %}</code></td>
+    <td class="number-data">{{ item.count }}</td>
+    <td class="number-data">{{ item.percent }}%</td>
+  </tr>
+{% endfor %}
+</table>
diff --git a/docs/_layouts/index.html b/docs/_layouts/index.html
index 58b3227834..374f4102a2 100644
--- a/docs/_layouts/index.html
+++ b/docs/_layouts/index.html
@@ -1,28 +1,29 @@
 ---
 layout: base
 ---
+{% assign t = site.data.locales[page.lang][page.lang] %}
 <div id="information">
   <ul>
     <li>
       <div class="group row">
-        <h2 id="install">{{ page.pagecontent.install.install }}</h2>
+        <h2 id="install">{{ t.pagecontent.install.install }}</h2>
         <br>
         <pre style='clear:both;text-align:center;margin-bottom:0.9em'><code id='selectable' onclick="selectText(this)">/usr/bin/ruby -e &quot;$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)&quot;</code></pre>
         <div class="col-1">
-          <p>{{ page.pagecontent.install.paste }}</p>
+          <p>{{ t.pagecontent.install.paste }}</p>
         </div>
         <div class="col-2">
-          <p>{{ page.pagecontent.install.what }}</p>
+          <p>{{ t.pagecontent.install.what }}</p>
         </div>
       </div>
     </li>
 
     <li>
       <div class="group row">
-       <h2 id="question">{{ page.pagecontent.question }}</h2>
+       <h2 id="question">{{ t.pagecontent.question }}</h2>
        <br>
         <div class="col-1">
-          <p>{{ page.pagecontent.what }}</p>
+          <p>{{ t.pagecontent.what }}</p>
         </div>
         <div class="col-2">
 {% highlight bash %}
@@ -34,7 +35,7 @@ $ brew install wget
     <li>
       <div class="group row">
         <div class="col-1">
-          <p>{{ page.pagecontent.how }}</p>
+          <p>{{ t.pagecontent.how }}</p>
         </div>
         <div class="col-2">
 {% highlight bash %}
@@ -53,14 +54,14 @@ bin/wget -> ../Cellar/wget/1.16.1/bin/wget
     <li>
       <div class="group row">
         <div class="col-1">
-          <p>{{ page.pagecontent.prefix }}</p>
+          <p>{{ t.pagecontent.prefix }}</p>
         </div>
       </div>
     </li>
     <li>
       <div class="group row">
         <div class="col-1">
-          <p>{{ page.pagecontent.createpackages }}</p>
+          <p>{{ t.pagecontent.createpackages }}</p>
         </div>
         <div class="col-2">
 {% highlight bash %}
@@ -73,11 +74,11 @@ Created /usr/local/Homebrew/Library/Taps/homebrew/homebrew-core/Formula/bar.rb
     <li>
       <div class="group row">
         <div class="col-1">
-          <p>{{ page.pagecontent.hack }}</p>
+          <p>{{ t.pagecontent.hack }}</p>
         </div>
         <div class="col-2">
 {% highlight bash %}
-$ brew edit wget # {{ page.pagecontent.editor }}
+$ brew edit wget # {{ t.pagecontent.editor }}
 {% endhighlight %}
         </div>
       </div>
@@ -85,7 +86,7 @@ $ brew edit wget # {{ page.pagecontent.editor }}
     <li>
       <div class="group row">
         <div class="col-1">
-          <p>{{ page.pagecontent.formula }}</p>
+          <p>{{ t.pagecontent.formula }}</p>
         </div>
         <div class="col-2">
 {% highlight ruby %}
@@ -106,41 +107,68 @@ end
     <li>
       <div class="group row">
         <div class="col-1">
-          <p>{{ page.pagecontent.complement }}</p>
+          <p>{{ t.pagecontent.complement }}</p>
         </div>
       </div>
     </li>
 
     <li>
       <div class="group row">
-        <h2 id="further-doc">{{ page.pagecontent.doc.further }}</h2>
+        <h2 id="further-doc">{{ t.pagecontent.doc.further }}</h2>
         <div class="button">
-          <p><a href="https://docs.brew.sh/">docs.brew.sh</a></p>
+          <p><a href="https://docs.brew.sh">docs.brew.sh</a></p>
         </div>
       </div>
     </li>
 
     <li>
       <div class="group row">
-        <h2 id="homebrew-community">{{ page.pagecontent.doc.community }}</h2>
+        <h2 id="homebrew-patreon">{{ t.pagecontent.doc.patreon }}</h2>
         <div class="button">
-          <p><a href="https://discourse.brew.sh/">discourse.brew.sh</a></p>
+          <p><a href="https://www.patreon.com/homebrew">patreon.com/homebrew</a></p>
         </div>
       </div>
     </li>
 
     <li>
       <div class="group row">
-        <h2 id="homebrew-blog">{{ page.pagecontent.doc.blog }}</h2>
+        <h2 id="homebrew-community">{{ t.pagecontent.doc.community }}</h2>
         <div class="button">
-          <p><a href="/blog">brew.sh/blog</a></p>
+          <p><a href="https://discourse.brew.sh">discourse.brew.sh</a></p>
+        </div>
+      </div>
+    </li>
+
+    <li>
+      <div class="group row">
+        <h2 id="homebrew-blog">{{ t.pagecontent.doc.blog }}</h2>
+        <div class="button">
+          <p><a href="/blog/">brew.sh/blog</a></p>
+        </div>
+      </div>
+    </li>
+
+    <li>
+      <div class="group row">
+        <h2 id="homebrew-formulae">{{ t.pagecontent.doc.formulae }}</h2>
+        <div class="button">
+          <p><a href="http://formulae.brew.sh">formulae.brew.sh</a></p>
+        </div>
+      </div>
+    </li>
+
+    <li>
+      <div class="group row">
+        <h2 id="analytics-data">{{ t.pagecontent.doc.analytics }}</h2>
+        <div class="button">
+          <p><a href="/analytics/">brew.sh/analytics</a></p>
         </div>
       </div>
     </li>
 
     <li>
       <div class="group row credits">
-        <p>{{ page.pagecontent.foot.code }} {{ page.pagecontent.foot.page }} {{ page.pagecontent.foot.translation }}</p>
+        <p>{{ t.pagecontent.foot.code }} {{ t.pagecontent.foot.page }} {{ t.pagecontent.foot.translation }}</p>
       </div>
     </li>
   </ul>

From f2ce6489b2ad875a9f5f828334fcefb4f8ef3822 Mon Sep 17 00:00:00 2001
From: Mike McQuaid <mike@mikemcquaid.com>
Date: Thu, 22 Feb 2018 19:46:58 +0000
Subject: [PATCH 56/69] Use more docs.brew.sh short links

These are nicer on the eyes.
---
 CONTRIBUTING.md                         |  2 +-
 Library/Homebrew/README.md              |  2 +-
 Library/Homebrew/cmd/analytics.rb       |  2 +-
 Library/Homebrew/cmd/help.rb            |  2 +-
 Library/Homebrew/cmd/info.rb            |  2 +-
 Library/Homebrew/cmd/tap-info.rb        |  2 +-
 Library/Homebrew/cmd/update-report.rb   |  2 +-
 Library/Homebrew/dev-cmd/create.rb      |  2 +-
 Library/Homebrew/formula.rb             |  4 ++--
 Library/Homebrew/manpages/brew.1.md.erb |  4 ++--
 Library/Homebrew/missing_formula.rb     |  2 +-
 Library/Homebrew/os.rb                  |  2 +-
 Library/Homebrew/utils/analytics.rb     |  2 +-
 README.md                               |  4 ++--
 manpages/brew.1                         | 10 +++++-----
 15 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 0cf37b85de..7ba6830c03 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -5,7 +5,7 @@ First time contributing to Homebrew? Read our [Code of Conduct](https://github.c
 
 * Run `brew update` (twice).
 * Run and read `brew doctor`.
-* Read [the Troubleshooting Checklist](https://docs.brew.sh/Troubleshooting.html).
+* Read [the Troubleshooting Checklist](https://docs.brew.sh/Troubleshooting).
 * Open an issue on the formula's repository or on Homebrew/brew if it's not a formula-specific issue.
 
 ### Propose a feature
diff --git a/Library/Homebrew/README.md b/Library/Homebrew/README.md
index 681bb92880..e0e9613734 100644
--- a/Library/Homebrew/README.md
+++ b/Library/Homebrew/README.md
@@ -3,6 +3,6 @@ This is the (partially) documented public API for Homebrew.
 
 The main class you should look at is the {Formula} class (and classes linked from there). That's the class that's used to create Homebrew formulae (i.e. package descriptions). Assume anything else you stumble upon is private.
 
-You may also find the [Formula Cookbook](https://docs.brew.sh/Formula-Cookbook.html) and [Ruby Style Guide](https://github.com/styleguide/ruby) helpful in creating formulae.
+You may also find the [Formula Cookbook](https://docs.brew.sh/Formula-Cookbook) and [Ruby Style Guide](https://github.com/styleguide/ruby) helpful in creating formulae.
 
 Good luck!
diff --git a/Library/Homebrew/cmd/analytics.rb b/Library/Homebrew/cmd/analytics.rb
index 0985f00b84..0f56cd675f 100644
--- a/Library/Homebrew/cmd/analytics.rb
+++ b/Library/Homebrew/cmd/analytics.rb
@@ -1,6 +1,6 @@
 #:  * `analytics` [`state`]:
 #:    Display anonymous user behaviour analytics state.
-#:    Read more at <https://docs.brew.sh/Analytics.html>.
+#:    Read more at <https://docs.brew.sh/Analytics>.
 #:
 #:  * `analytics` (`on`|`off`):
 #:    Turn on/off Homebrew's analytics.
diff --git a/Library/Homebrew/cmd/help.rb b/Library/Homebrew/cmd/help.rb
index c85916f9b9..c85b92124a 100644
--- a/Library/Homebrew/cmd/help.rb
+++ b/Library/Homebrew/cmd/help.rb
@@ -16,7 +16,7 @@ HOMEBREW_HELP = <<~EOS.freeze
   Developers:
     brew create [URL [--no-fetch]]
     brew edit [FORMULA...]
-    https://docs.brew.sh/Formula-Cookbook.html
+    https://docs.brew.sh/Formula-Cookbook
 
   Further help:
     man brew
diff --git a/Library/Homebrew/cmd/info.rb b/Library/Homebrew/cmd/info.rb
index 1eb9fe9fed..27f719c57e 100644
--- a/Library/Homebrew/cmd/info.rb
+++ b/Library/Homebrew/cmd/info.rb
@@ -17,7 +17,7 @@
 #:    information on all installed formulae.
 #:
 #:    See the docs for examples of using the JSON output:
-#:    <https://docs.brew.sh/Querying-Brew.html>
+#:    <https://docs.brew.sh/Querying-Brew>
 
 require "missing_formula"
 require "caveats"
diff --git a/Library/Homebrew/cmd/tap-info.rb b/Library/Homebrew/cmd/tap-info.rb
index 3d995f4bcb..26daa1a8ae 100644
--- a/Library/Homebrew/cmd/tap-info.rb
+++ b/Library/Homebrew/cmd/tap-info.rb
@@ -13,7 +13,7 @@
 #:    Pass `--installed` to get information on installed taps.
 #:
 #:    See the docs for examples of using the JSON output:
-#:    <https://docs.brew.sh/Querying-Brew.html>
+#:    <https://docs.brew.sh/Querying-Brew>
 
 require "tap"
 
diff --git a/Library/Homebrew/cmd/update-report.rb b/Library/Homebrew/cmd/update-report.rb
index 055c55a84f..2c4d3de0c5 100644
--- a/Library/Homebrew/cmd/update-report.rb
+++ b/Library/Homebrew/cmd/update-report.rb
@@ -35,7 +35,7 @@ module Homebrew
         ohai "Homebrew has enabled anonymous aggregate user behaviour analytics."
         puts <<~EOS
           #{Tty.bold}Read the analytics documentation (and how to opt-out) here:
-            #{Formatter.url("https://docs.brew.sh/Analytics.html")}#{Tty.reset}
+            #{Formatter.url("https://docs.brew.sh/Analytics")}#{Tty.reset}
 
         EOS
 
diff --git a/Library/Homebrew/dev-cmd/create.rb b/Library/Homebrew/dev-cmd/create.rb
index 122be25938..3963e5a7bc 100644
--- a/Library/Homebrew/dev-cmd/create.rb
+++ b/Library/Homebrew/dev-cmd/create.rb
@@ -167,7 +167,7 @@ class FormulaCreator
 
   def template
     <<~EOS
-      # Documentation: https://docs.brew.sh/Formula-Cookbook.html
+      # Documentation: https://docs.brew.sh/Formula-Cookbook
       #                http://www.rubydoc.info/github/Homebrew/brew/master/Formula
       # PLEASE REMOVE ALL GENERATED COMMENTS BEFORE SUBMITTING YOUR PULL REQUEST!
        class #{Formulary.class_s(name)} < Formula
diff --git a/Library/Homebrew/formula.rb b/Library/Homebrew/formula.rb
index 1355e5945c..228eb537be 100644
--- a/Library/Homebrew/formula.rb
+++ b/Library/Homebrew/formula.rb
@@ -28,7 +28,7 @@ require "language/python"
 # @see SharedEnvExtension
 # @see FileUtils
 # @see Pathname
-# @see https://docs.brew.sh/Formula-Cookbook.html Formula Cookbook
+# @see https://docs.brew.sh/Formula-Cookbook Formula Cookbook
 # @see https://github.com/styleguide/ruby Ruby Style Guide
 #
 # <pre>class Wget < Formula
@@ -2057,7 +2057,7 @@ class Formula
     # and you haven't passed or previously used any options on this formula.
     #
     # If you maintain your own repository, you can add your own bottle links.
-    # https://docs.brew.sh/Bottles.html
+    # https://docs.brew.sh/Bottles
     # You can ignore this block entirely if submitting to Homebrew/homebrew-core.
     # It'll be handled for you by the Brew Test Bot.
     #
diff --git a/Library/Homebrew/manpages/brew.1.md.erb b/Library/Homebrew/manpages/brew.1.md.erb
index fbe6fca946..533e1d5948 100644
--- a/Library/Homebrew/manpages/brew.1.md.erb
+++ b/Library/Homebrew/manpages/brew.1.md.erb
@@ -76,7 +76,7 @@ scripts that reside somewhere in the `PATH`, named `brew-`<cmdname> or
 to create your own commands without modifying Homebrew's internals.
 
 Instructions for creating your own commands can be found in the docs:
-<https://docs.brew.sh/External-Commands.html>
+<https://docs.brew.sh/External-Commands>
 
 ## SPECIFYING FORMULAE
 
@@ -193,7 +193,7 @@ can take several different forms:
     *Default:* the number of available CPU cores.
 
   * `HOMEBREW_NO_ANALYTICS`:
-    If set, Homebrew will not send analytics. See: <https://docs.brew.sh/Analytics.html>
+    If set, Homebrew will not send analytics. See: <https://docs.brew.sh/Analytics>
 
   * `HOMEBREW_NO_AUTO_UPDATE`:
     If set, Homebrew will not auto-update before running `brew install`,
diff --git a/Library/Homebrew/missing_formula.rb b/Library/Homebrew/missing_formula.rb
index 146c3e984e..31dfa94efa 100644
--- a/Library/Homebrew/missing_formula.rb
+++ b/Library/Homebrew/missing_formula.rb
@@ -155,7 +155,7 @@ module Homebrew
               git -C "$(brew --repo #{tap})" show #{short_hash}^:#{relative_path}
 
             If you still use this formula consider creating your own tap:
-              https://docs.brew.sh/How-to-Create-and-Maintain-a-Tap.html
+              https://docs.brew.sh/How-to-Create-and-Maintain-a-Tap
           EOS
         end
       end
diff --git a/Library/Homebrew/os.rb b/Library/Homebrew/os.rb
index d56b032286..cc6c865375 100644
--- a/Library/Homebrew/os.rb
+++ b/Library/Homebrew/os.rb
@@ -17,7 +17,7 @@ module OS
     require "os/mac"
     # Don't tell people to report issues on unsupported versions of macOS.
     if !OS::Mac.prerelease? && !OS::Mac.outdated_release?
-      ISSUES_URL = "https://docs.brew.sh/Troubleshooting.html".freeze
+      ISSUES_URL = "https://docs.brew.sh/Troubleshooting".freeze
     end
     PATH_OPEN = "/usr/bin/open".freeze
   elsif OS.linux?
diff --git a/Library/Homebrew/utils/analytics.rb b/Library/Homebrew/utils/analytics.rb
index 9766c14db3..adef3e811d 100644
--- a/Library/Homebrew/utils/analytics.rb
+++ b/Library/Homebrew/utils/analytics.rb
@@ -40,7 +40,7 @@ module Utils
         end
 
         # Send analytics. Don't send or store any personally identifiable information.
-        # https://docs.brew.sh/Analytics.html
+        # https://docs.brew.sh/Analytics
         # https://developers.google.com/analytics/devguides/collection/protocol/v1/devguide
         # https://developers.google.com/analytics/devguides/collection/protocol/v1/parameters
         if ENV["HOMEBREW_ANALYTICS_DEBUG"]
diff --git a/README.md b/README.md
index 5513089690..54127161fb 100644
--- a/README.md
+++ b/README.md
@@ -14,7 +14,7 @@ Features, usage and installation instructions are [summarised on the homepage](h
 ## Troubleshooting
 First, please run `brew update` and `brew doctor`.
 
-Second, read the [Troubleshooting Checklist](https://docs.brew.sh/Troubleshooting.html).
+Second, read the [Troubleshooting Checklist](https://docs.brew.sh/Troubleshooting).
 
 **If you don't read these it will take us far longer to help you with your problem.**
 
@@ -26,7 +26,7 @@ We'd love you to contribute to Homebrew. First, please read our [Contribution Gu
 
 We explicitly welcome contributions from people who have never contributed to open-source before: we were all beginners once! We can help build on a partially working pull request with the aim of getting it merged. We are also actively seeking to diversify our contributors and especially welcome contributions from women from all backgrounds and people of colour.
 
-A good starting point for contributing is running `brew audit --strict` with some of the packages you use (e.g. `brew audit --strict wget` if you use `wget`) and then read through the warnings, try to fix them until `brew audit --strict` shows no results and [submit a pull request](https://docs.brew.sh/How-To-Open-a-Homebrew-Pull-Request.html). If no formulae you use have warnings you can run `brew audit --strict` without arguments to have it run on all packages and pick one.
+A good starting point for contributing is running `brew audit --strict` with some of the packages you use (e.g. `brew audit --strict wget` if you use `wget`) and then read through the warnings, try to fix them until `brew audit --strict` shows no results and [submit a pull request](https://docs.brew.sh/How-To-Open-a-Homebrew-Pull-Request). If no formulae you use have warnings you can run `brew audit --strict` without arguments to have it run on all packages and pick one.
 
 Alternatively, for something more substantial, check out one of the issues labeled `help wanted` in [Homebrew/brew](https://github.com/homebrew/brew/issues?q=is%3Aopen+is%3Aissue+label%3A%22help+wanted%22) or [Homebrew/homebrew-core](https://github.com/homebrew/homebrew-core/issues?q=is%3Aopen+is%3Aissue+label%3A%22help+wanted%22).
 
diff --git a/manpages/brew.1 b/manpages/brew.1
index 4f373558c6..56ae23677b 100644
--- a/manpages/brew.1
+++ b/manpages/brew.1
@@ -45,7 +45,7 @@ Perform a substring search of formula names for \fItext\fR\. If \fItext\fR is su
 .
 .TP
 \fBanalytics\fR [\fBstate\fR]
-Display anonymous user behaviour analytics state\. Read more at \fIhttps://docs\.brew\.sh/Analytics\.html\fR\.
+Display anonymous user behaviour analytics state\. Read more at \fIhttps://docs\.brew\.sh/Analytics\fR\.
 .
 .TP
 \fBanalytics\fR (\fBon\fR|\fBoff\fR)
@@ -226,7 +226,7 @@ Print a JSON representation of \fIformulae\fR\. Currently the only accepted valu
 Pass \fB\-\-all\fR to get information on all formulae, or \fB\-\-installed\fR to get information on all installed formulae\.
 .
 .IP
-See the docs for examples of using the JSON output: \fIhttps://docs\.brew\.sh/Querying\-Brew\.html\fR
+See the docs for examples of using the JSON output: \fIhttps://docs\.brew\.sh/Querying\-Brew\fR
 .
 .TP
 \fBinstall\fR [\fB\-\-debug\fR] [\fB\-\-env=\fR(\fBstd\fR|\fBsuper\fR)] [\fB\-\-ignore\-dependencies\fR|\fB\-\-only\-dependencies\fR] [\fB\-\-cc=\fR\fIcompiler\fR] [\fB\-\-build\-from\-source\fR|\fB\-\-force\-bottle\fR] [\fB\-\-devel\fR|\fB\-\-HEAD\fR] [\fB\-\-keep\-tmp\fR] [\fB\-\-build\-bottle\fR] [\fB\-\-force\fR] [\fB\-\-verbose\fR] \fIformula\fR [\fIoptions\fR \.\.\.]
@@ -510,7 +510,7 @@ Print a JSON representation of \fItaps\fR\. Currently the only accepted value fo
 Pass \fB\-\-installed\fR to get information on installed taps\.
 .
 .IP
-See the docs for examples of using the JSON output: \fIhttps://docs\.brew\.sh/Querying\-Brew\.html\fR
+See the docs for examples of using the JSON output: \fIhttps://docs\.brew\.sh/Querying\-Brew\fR
 .
 .TP
 \fBtap\-pin\fR \fItap\fR
@@ -937,7 +937,7 @@ Integrates Homebrew formulae with macOS\'s \fBlaunchctl\fR(1) manager: \fIhttps:
 Homebrew, like \fBgit\fR(1), supports external commands\. These are executable scripts that reside somewhere in the \fBPATH\fR, named \fBbrew\-\fR\fIcmdname\fR or \fBbrew\-\fR\fIcmdname\fR\fB\.rb\fR, which can be invoked like \fBbrew\fR \fIcmdname\fR\. This allows you to create your own commands without modifying Homebrew\'s internals\.
 .
 .P
-Instructions for creating your own commands can be found in the docs: \fIhttps://docs\.brew\.sh/External\-Commands\.html\fR
+Instructions for creating your own commands can be found in the docs: \fIhttps://docs\.brew\.sh/External\-Commands\fR
 .
 .SH "SPECIFYING FORMULAE"
 Many Homebrew commands accept one or more \fIformula\fR arguments\. These arguments can take several different forms:
@@ -1052,7 +1052,7 @@ If set, instructs Homebrew to use the value of \fBHOMEBREW_MAKE_JOBS\fR as the n
 .
 .TP
 \fBHOMEBREW_NO_ANALYTICS\fR
-If set, Homebrew will not send analytics\. See: \fIhttps://docs\.brew\.sh/Analytics\.html\fR
+If set, Homebrew will not send analytics\. See: \fIhttps://docs\.brew\.sh/Analytics\fR
 .
 .TP
 \fBHOMEBREW_NO_AUTO_UPDATE\fR

From d05b8522d5f51db5ca2f75fe322848df9b8ff88b Mon Sep 17 00:00:00 2001
From: Mike McQuaid <mike@mikemcquaid.com>
Date: Fri, 23 Feb 2018 14:51:08 +0000
Subject: [PATCH 57/69] README: use docs.brew.sh link.

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 54127161fb..240774ed2e 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 # Homebrew
 [![GitHub release](https://img.shields.io/github/release/Homebrew/brew.svg)](https://github.com/Homebrew/brew/releases)
 
-Features, usage and installation instructions are [summarised on the homepage](https://brew.sh). Terminology (e.g. the difference between a Cellar, Tap, Cask and so forth) is [explained here](docs/Formula-Cookbook.md#homebrew-terminology).
+Features, usage and installation instructions are [summarised on the homepage](https://brew.sh). Terminology (e.g. the difference between a Cellar, Tap, Cask and so forth) is [explained here](https://docs.brew.sh/Formula-Cookbook#homebrew-terminology).
 
 ## What Packages Are Available?
 1. Type `brew search` for a list.

From 190e665bb1db54d452ed9e0bf93c6985bd8dab5f Mon Sep 17 00:00:00 2001
From: Mike McQuaid <mike@mikemcquaid.com>
Date: Fri, 23 Feb 2018 19:39:19 +0000
Subject: [PATCH 58/69] Revert "docs: use short links."

This reverts commit e63a2ee8de12f0f938f6a95cdb9763dbe0187b4a.

Closes #3832.
---
 docs/Acceptable-Formulae.md                   |  8 +-
 docs/Bottles.md                               |  2 +-
 docs/Brew-Test-Bot-For-Core-Contributors.md   |  2 +-
 ...lding-Against-Non-Homebrew-Dependencies.md |  2 +-
 docs/Common-Issues.md                         |  2 +-
 docs/External-Commands.md                     |  2 +-
 docs/FAQ.md                                   |  8 +-
 docs/Formula-Cookbook.md                      |  8 +-
 docs/Homebrew-and-Python.md                   |  4 +-
 docs/How-To-Open-a-Homebrew-Pull-Request.md   |  2 +-
 docs/How-to-Create-and-Maintain-a-Tap.md      |  4 +-
 ...rew-with-Homebrew-keg-only-dependencies.md |  2 +-
 docs/Installation.md                          |  6 +-
 docs/Maintainer-Guidelines.md                 |  6 +-
 docs/New-Maintainer-Checklist.md              |  2 +-
 docs/Node-for-Formula-Authors.md              |  2 +-
 docs/README.md                                | 74 +++++++++----------
 docs/Tips-N'-Tricks.md                        |  2 +-
 docs/Troubleshooting.md                       |  2 +-
 docs/Versions.md                              |  2 +-
 20 files changed, 71 insertions(+), 71 deletions(-)

diff --git a/docs/Acceptable-Formulae.md b/docs/Acceptable-Formulae.md
index 1530238c54..df799bb1a7 100644
--- a/docs/Acceptable-Formulae.md
+++ b/docs/Acceptable-Formulae.md
@@ -2,14 +2,14 @@
 
 Some formulae should not go in
 [homebrew/core](https://github.com/Homebrew/homebrew-core). But there are
-additional [Interesting Taps and Forks](Interesting-Taps-and-Forks) and anyone can start their
+additional [Interesting Taps and Forks](Interesting-Taps-and-Forks.md) and anyone can start their
 own!
 
 ### Dupes in `homebrew/core`
 We now accept stuff that comes with macOS as long as it uses `keg_only :provided_by_macos` to be keg-only by default.
 
 ### Versioned formulae in `homebrew/core`
-We now accept versioned formulae as long as they [meet the requirements](Versions).
+We now accept versioned formulae as long as they [meet the requirements](Versions.md).
 
 ### We don’t like tools that upgrade themselves
 Software that can upgrade itself does not integrate well with Homebrew's own
@@ -36,7 +36,7 @@ the upstream project. Tarballs are preferred to Git checkouts, and
 tarballs should include the version in the filename whenever possible.
 
 We don’t accept software without a tagged version because they regularly break
-due to upstream changes and we can’t provide [bottles](Bottles) for them.
+due to upstream changes and we can’t provide [bottles](Bottles.md) for them.
 
 ### Bindings
 First check that there is not already a binding available via
@@ -62,7 +62,7 @@ get maintained and partly because we have to draw the line somewhere.
 We frown on authors submitting their own work unless it is very popular.
 
 Don’t forget Homebrew is all Git underneath!
-[Maintain your own tap](How-to-Create-and-Maintain-a-Tap) if you have to!
+[Maintain your own tap](How-to-Create-and-Maintain-a-Tap.md) if you have to!
 
 There may be exceptions to these rules in the main repository; we may
 include things that don't meet these criteria or reject things that do.
diff --git a/docs/Bottles.md b/docs/Bottles.md
index b216b2731a..426b9e91c4 100644
--- a/docs/Bottles.md
+++ b/docs/Bottles.md
@@ -8,7 +8,7 @@ If a bottle is available and usable it will be downloaded and poured automatical
 Bottles will not be used if the user requests it (see above), if the formula requests it (with `pour_bottle?`), if any options are specified during installation (bottles are all compiled with default options), if the bottle is not up to date (e.g. lacking a checksum) or if the bottle's `cellar` is not `:any` nor equal to the current `HOMEBREW_CELLAR`.
 
 ## Creation
-Bottles are created using the [Brew Test Bot](Brew-Test-Bot). This happens mostly when people submit pull requests to Homebrew and the `bottle do` block is updated by maintainers when they `brew pull --bottle` the contents of a pull request. For the Homebrew organisations' taps they are uploaded to and downloaded from [Bintray](https://bintray.com/homebrew).
+Bottles are created using the [Brew Test Bot](Brew-Test-Bot.md). This happens mostly when people submit pull requests to Homebrew and the `bottle do` block is updated by maintainers when they `brew pull --bottle` the contents of a pull request. For the Homebrew organisations' taps they are uploaded to and downloaded from [Bintray](https://bintray.com/homebrew).
 
 By default, bottles will be built for the oldest CPU supported by the OS/architecture you're building for. (That's Core 2 for 64-bit OSs, Core for 32-bit.) This ensures that bottles are compatible with all computers you might distribute them to. If you *really* want your bottles to be optimized for something else, you can pass the `--bottle-arch=` option to build for another architecture - for example, `brew install foo --bottle-arch=penryn`. Just remember that if you build for a newer architecture some of your users might get binaries they can't run and that would be sad!
 
diff --git a/docs/Brew-Test-Bot-For-Core-Contributors.md b/docs/Brew-Test-Bot-For-Core-Contributors.md
index 939e6e9bde..8df0a28350 100644
--- a/docs/Brew-Test-Bot-For-Core-Contributors.md
+++ b/docs/Brew-Test-Bot-For-Core-Contributors.md
@@ -5,7 +5,7 @@ If a build has run and passed on `brew test-bot` then it can be used to quickly
 There are two types of Jenkins jobs you will interact with:
 
 ## [Homebrew Core Pull Requests](https://jenkins.brew.sh/job/Homebrew%20Core/)
-This job automatically builds any pull requests submitted to Homebrew/homebrew-core. On success or failure it updates the pull request status (see more details on the [main Brew Test Bot documentation page](Brew-Test-Bot)). On a successful build it automatically uploads bottles.
+This job automatically builds any pull requests submitted to Homebrew/homebrew-core. On success or failure it updates the pull request status (see more details on the [main Brew Test Bot documentation page](Brew-Test-Bot.md)). On a successful build it automatically uploads bottles.
 
 ## [Homebrew Testing](https://jenkins.brew.sh/job/Homebrew%20Testing/)
 This job is manually triggered to run [`brew test-bot`](https://github.com/Homebrew/homebrew-test-bot/blob/master/cmd/brew-test-bot.rb) with user-specified parameters. On a successful build it automatically uploads bottles.
diff --git a/docs/Building-Against-Non-Homebrew-Dependencies.md b/docs/Building-Against-Non-Homebrew-Dependencies.md
index 0c8ad98028..4e85757a1b 100644
--- a/docs/Building-Against-Non-Homebrew-Dependencies.md
+++ b/docs/Building-Against-Non-Homebrew-Dependencies.md
@@ -8,4 +8,4 @@ As Homebrew became primarily a binary package manager, most users were fulfillin
 
 ## Today
 
-If you wish to build against custom non-Homebrew dependencies that are provided by Homebrew (e.g. a non-Homebrew, non-macOS `ruby`) then you must [create and maintain your own tap](How-to-Create-and-Maintain-a-Tap) as these formulae will not be accepted in Homebrew/homebrew-core. Once you have done that you can specify `env :std` in the formula which will allow a e.g. `which ruby` to access your existing `PATH` variable and allow compilation to link against this Ruby.
+If you wish to build against custom non-Homebrew dependencies that are provided by Homebrew (e.g. a non-Homebrew, non-macOS `ruby`) then you must [create and maintain your own tap](How-to-Create-and-Maintain-a-Tap.md) as these formulae will not be accepted in Homebrew/homebrew-core. Once you have done that you can specify `env :std` in the formula which will allow a e.g. `which ruby` to access your existing `PATH` variable and allow compilation to link against this Ruby.
diff --git a/docs/Common-Issues.md b/docs/Common-Issues.md
index 8960720681..a3a31ce80b 100644
--- a/docs/Common-Issues.md
+++ b/docs/Common-Issues.md
@@ -121,7 +121,7 @@ To list all files that would be deleted:
 
 Don't follow the advice here but fix by using
 `Language::Python.setup_install_args` in the formula as described in
-[Python for Formula Authors](Python-for-Formula-Authors).
+[Python for Formula Authors](Python-for-Formula-Authors.md).
 
 ### Upgrading macOS
 
diff --git a/docs/External-Commands.md b/docs/External-Commands.md
index 9b03f04228..65282fcb16 100644
--- a/docs/External-Commands.md
+++ b/docs/External-Commands.md
@@ -44,7 +44,7 @@ Note they are largely untested, and as always, be careful about running untested
 
 ### brew-livecheck
 Check if there is a new upstream version of a formula.
-See the [`README`](https://github.com/Homebrew/homebrew-livecheck/blob/master/README) for more info and usage.
+See the [`README`](https://github.com/Homebrew/homebrew-livecheck/blob/master/README.md) for more info and usage.
 
 Install using:
 
diff --git a/docs/FAQ.md b/docs/FAQ.md
index b455ca5f78..9d76bf4ab6 100644
--- a/docs/FAQ.md
+++ b/docs/FAQ.md
@@ -76,11 +76,11 @@ the launchctl PATH for _all users_. For earlier versions of macOS, see
 [this page](https://developer.apple.com/legacy/library/qa/qa1067/_index.html).
 
 ## How do I contribute to Homebrew?
-Read [CONTRIBUTING.md](https://github.com/Homebrew/brew/blob/master/CONTRIBUTING).
+Read [CONTRIBUTING.md](https://github.com/Homebrew/brew/blob/master/CONTRIBUTING.md).
 
 ## Why do you compile everything?
 Homebrew provides pre-compiled versions for many formulae. These
-pre-compiled versions are referred to as [bottles](Bottles) and are available
+pre-compiled versions are referred to as [bottles](Bottles.md) and are available
 at <https://bintray.com/homebrew/bottles>.
 
 If available, bottled binaries will be used by default except under the
@@ -163,7 +163,7 @@ creating a separate user account especially for use of Homebrew.
 
 ## Why isn’t a particular command documented?
 
-If it’s not in `man brew`, it’s probably an external command. These are documented [here](External-Commands).
+If it’s not in `man brew`, it’s probably an external command. These are documented [here](External-Commands.md).
 
 ## Why haven’t you pulled my pull request?
 If it’s been a while, bump it with a “bump” comment. Sometimes we miss requests and there are plenty of them. Maybe we were thinking on something. It will encourage consideration. In the meantime if you could rebase the pull request so that it can be cherry-picked more easily we will love you for a long time.
@@ -179,7 +179,7 @@ install <formula>`. If you encounter any issues, run the command with the
 into a debugging shell.
 
 If you want your new formula to be part of `homebrew/core` or want
-to learn more about writing formulae, then please read the [Formula Cookbook](Formula-Cookbook).
+to learn more about writing formulae, then please read the [Formula Cookbook](Formula-Cookbook.md).
 
 ## Can I install my own stuff to `/usr/local`?
 Yes, `brew` is designed to not get in your way so you can use it how you
diff --git a/docs/Formula-Cookbook.md b/docs/Formula-Cookbook.md
index f977a8ef00..1f2b2e89e2 100644
--- a/docs/Formula-Cookbook.md
+++ b/docs/Formula-Cookbook.md
@@ -29,7 +29,7 @@ Make sure you run `brew update` before you start. This turns your Homebrew insta
 
 Before submitting a new formula make sure your package:
 
-*   meets all our [Acceptable Formulae](Acceptable-Formulae) requirements
+*   meets all our [Acceptable Formulae](Acceptable-Formulae.md) requirements
 *   isn't already in Homebrew (check `brew search <formula>`)
 *   isn't in another official [Homebrew tap](https://github.com/Homebrew)
 *   isn't already waiting to be merged (check the [issue tracker](https://github.com/Homebrew/homebrew-core/pulls))
@@ -37,7 +37,7 @@ Before submitting a new formula make sure your package:
 *   has a stable, tagged version (i.e. not just a GitHub repository with no versions)
 *   passes all `brew audit --new-formula <formula>` tests.
 
-Before submitting a new formula make sure you read over our [contribution guidelines](https://github.com/Homebrew/brew/blob/master/CONTRIBUTING).
+Before submitting a new formula make sure you read over our [contribution guidelines](https://github.com/Homebrew/brew/blob/master/CONTRIBUTING.md).
 
 ### Grab the URL
 
@@ -251,7 +251,7 @@ Check the top of the e.g. `./configure` output. Some configure scripts do not re
 
 ### Add a test to the formula
 
-Add a valid test to the [`test do`](http://www.rubydoc.info/github/Homebrew/brew/master/Formula&num;test-class_method) block of the formula. This will be run by `brew test foo` and the [Brew Test Bot](Brew-Test-Bot).
+Add a valid test to the [`test do`](http://www.rubydoc.info/github/Homebrew/brew/master/Formula&num;test-class_method) block of the formula. This will be run by `brew test foo` and the [Brew Test Bot](Brew-Test-Bot.md).
 
 The
 [`test do`](http://www.rubydoc.info/github/Homebrew/brew/master/Formula#test-class_method)
@@ -534,7 +534,7 @@ end
 
 ### Compiler selection
 
-Sometimes a package fails to build when using a certain compiler. Since recent [Xcode versions](Xcode) no longer include a GCC compiler we cannot simply force the use of GCC. Instead, the correct way to declare this is the [`fails_with` DSL method](http://www.rubydoc.info/github/Homebrew/brew/master/Formula#fails_with-class_method). A properly constructed [`fails_with`](http://www.rubydoc.info/github/Homebrew/brew/master/Formula#fails_with-class_method) block documents the latest compiler build version known to cause compilation to fail, and the cause of the failure. For example:
+Sometimes a package fails to build when using a certain compiler. Since recent [Xcode versions](Xcode.md) no longer include a GCC compiler we cannot simply force the use of GCC. Instead, the correct way to declare this is the [`fails_with` DSL method](http://www.rubydoc.info/github/Homebrew/brew/master/Formula#fails_with-class_method). A properly constructed [`fails_with`](http://www.rubydoc.info/github/Homebrew/brew/master/Formula#fails_with-class_method) block documents the latest compiler build version known to cause compilation to fail, and the cause of the failure. For example:
 
 ```ruby
 fails_with :clang do
diff --git a/docs/Homebrew-and-Python.md b/docs/Homebrew-and-Python.md
index 72bc7d7f7f..eb96e57583 100644
--- a/docs/Homebrew-and-Python.md
+++ b/docs/Homebrew-and-Python.md
@@ -1,6 +1,6 @@
 # Python
 
-This page describes how Python is handled in Homebrew for users. See [Python for Formula Authors](Python-for-Formula-Authors) for advice on writing formulae to install packages written in Python.
+This page describes how Python is handled in Homebrew for users. See [Python for Formula Authors](Python-for-Formula-Authors.md) for advice on writing formulae to install packages written in Python.
 
 Homebrew should work with any [CPython](https://stackoverflow.com/questions/2324208/is-there-any-difference-between-cpython-and-python) and defaults to the macOS system Python.
 
@@ -66,7 +66,7 @@ Some formulae provide Python bindings. Sometimes a `--with-python` or `--with-py
 
 Homebrew builds bindings against the first `python` (and `python-config`) in your `PATH`. (Check with `which python`).
 
-**Warning!** Python may crash (see [Common Issues](Common-Issues)) if you `import <module>` from a brewed Python if you ran `brew install <formula_with_python_bindings>` against the system Python. If you decide to switch to the brewed Python, then reinstall all formulae with Python bindings (e.g. `pyside`, `wxwidgets`, `pygtk`, `pygobject`, `opencv`, `vtk` and `boost-python`).
+**Warning!** Python may crash (see [Common Issues](Common-Issues.md)) if you `import <module>` from a brewed Python if you ran `brew install <formula_with_python_bindings>` against the system Python. If you decide to switch to the brewed Python, then reinstall all formulae with Python bindings (e.g. `pyside`, `wxwidgets`, `pygtk`, `pygobject`, `opencv`, `vtk` and `boost-python`).
 
 ## Policy for non-brewed Python bindings
 These should be installed via `pip install <package>`. To discover, you can use `pip search` or <https://pypi.python.org/pypi>. (**Note:** System Python does not provide `pip`. Follow the [pip documentation](https://pip.readthedocs.io/en/stable/installing/#install-pip) to install it for your system Python if you would like it.)
diff --git a/docs/How-To-Open-a-Homebrew-Pull-Request.md b/docs/How-To-Open-a-Homebrew-Pull-Request.md
index 979a031a54..812d990e08 100644
--- a/docs/How-To-Open-a-Homebrew-Pull-Request.md
+++ b/docs/How-To-Open-a-Homebrew-Pull-Request.md
@@ -34,7 +34,7 @@ To make a new branch and submit it for review, create a GitHub pull request with
 1. Check out the `master` branch with `git checkout master`.
 2. Retrieve new changes to the `master` branch with `brew update`.
 3. Create a new branch from the latest `master` branch with `git checkout -b <YOUR_BRANCH_NAME> origin/master`.
-4. Make your changes. For formulae, use `brew edit` or your favorite text editor, following all the guidelines in the [Formula Cookbook](Formula-Cookbook).
+4. Make your changes. For formulae, use `brew edit` or your favorite text editor, following all the guidelines in the [Formula Cookbook](Formula-Cookbook.md).
   * If there's a `bottle do` block in the formula, don't remove or change it; we'll update it when we pull your PR.
 5. Test your changes by doing the following, and ensure they all pass without issue. For changed formulae, make sure you do the `brew audit` step while your changed formula is installed.
   * `brew tests`
diff --git a/docs/How-to-Create-and-Maintain-a-Tap.md b/docs/How-to-Create-and-Maintain-a-Tap.md
index c3296c55d2..610380aa60 100644
--- a/docs/How-to-Create-and-Maintain-a-Tap.md
+++ b/docs/How-to-Create-and-Maintain-a-Tap.md
@@ -27,7 +27,7 @@ If it’s on GitHub, users can install any of your formulae with
 file here.
 
 If they want to get your tap without installing any formula at the same time,
-users can add it with the [`brew tap` command](Taps).
+users can add it with the [`brew tap` command](Taps.md).
 
 If it’s on GitHub, they can use `brew tap user/repo`, where `user` is your
 GitHub username and `homebrew-repo` your repository.
@@ -51,7 +51,7 @@ Once your tap is installed, Homebrew will update it each time a user runs
 
 ## External commands
 You can provide your tap users with custom `brew` commands by adding them in a
-`cmd` subdirectory. [Read more on external commands](External-Commands).
+`cmd` subdirectory. [Read more on external commands](External-Commands.md).
 
 See [homebrew/aliases](https://github.com/Homebrew/homebrew-aliases) for an
 example of a tap with external commands.
diff --git a/docs/How-to-build-software-outside-Homebrew-with-Homebrew-keg-only-dependencies.md b/docs/How-to-build-software-outside-Homebrew-with-Homebrew-keg-only-dependencies.md
index e40b04abce..1384ce9508 100644
--- a/docs/How-to-build-software-outside-Homebrew-with-Homebrew-keg-only-dependencies.md
+++ b/docs/How-to-build-software-outside-Homebrew-with-Homebrew-keg-only-dependencies.md
@@ -2,7 +2,7 @@
 
 ## What does "keg-only" mean?
 
-The [FAQ](FAQ) briefly explains this.
+The [FAQ](FAQ.md) briefly explains this.
 
 As an example:
 
diff --git a/docs/Installation.md b/docs/Installation.md
index 5d2eee6d92..9f091d2e58 100644
--- a/docs/Installation.md
+++ b/docs/Installation.md
@@ -4,7 +4,7 @@ The suggested and easiest way to install Homebrew is on the
 [homepage](https://brew.sh).
 
 The standard script installs Homebrew to `/usr/local` so that
-[you don’t need sudo](FAQ) when you
+[you don’t need sudo](FAQ.md) when you
 `brew install`. It is a careful script; it can be run even if you have stuff
 installed to `/usr/local` already. It tells you exactly what it will do before
 it does it too. And you have to confirm everything it will do before it starts.
@@ -39,12 +39,12 @@ mkdir homebrew && curl -L https://github.com/Homebrew/brew/tarball/master | tar
 Create a Homebrew installation wherever you extract the tarball. Whichever `brew` command is called is where the packages will be installed. You can use this as you see fit, e.g. a system set of libs in `/usr/local` and tweaked formulae for development in `~/homebrew`.
 
 ## Uninstallation
-Uninstallation is documented in the [FAQ](FAQ).
+Uninstallation is documented in the [FAQ](FAQ.md).
 
 <a name="1"><sup>1</sup></a> Not all formulae have CPU or OS requirements, but
 you can assume you will have trouble if you don’t conform. Also, you can find
 PowerPC and Tiger branches from other users in the fork network. See
-[Interesting Taps and Forks](Interesting-Taps-and-Forks).
+[Interesting Taps and Forks](Interesting-Taps-and-Forks.md).
 
 <a name="2"><sup>2</sup></a> 10.10 or higher is recommended. 10.5–10.9 are
 supported on a best-effort basis. For 10.4 see
diff --git a/docs/Maintainer-Guidelines.md b/docs/Maintainer-Guidelines.md
index 9d8b4bbdfd..1d69f53811 100644
--- a/docs/Maintainer-Guidelines.md
+++ b/docs/Maintainer-Guidelines.md
@@ -5,7 +5,7 @@ access** to Homebrew’s repository and help merge the contributions of
 others. You may find what is written here interesting, but it’s
 definitely not a beginner’s guide.
 
-Maybe you were looking for the [Formula Cookbook](Formula-Cookbook)?
+Maybe you were looking for the [Formula Cookbook](Formula-Cookbook.md)?
 
 ## Quick checklist
 
@@ -45,7 +45,7 @@ Add other names as aliases as symlinks in `Aliases` in the tap root. Ensure the
 name referenced on the homepage is one of these, as it may be different and have
 underscores and hyphens and so on.
 
-We now accept versioned formulae as long as they [meet the requirements](Versions).
+We now accept versioned formulae as long as they [meet the requirements](Versions.md).
 
 ### Merging, rebasing, cherry-picking
 Merging should be done in the `Homebrew/brew` repository to preserve history & GPG commit signing,
@@ -64,7 +64,7 @@ the commits. Our main branch history should be useful to other people,
 not confusing.
 
 ### Testing
-We need to at least check that it builds. Use the [Brew Test Bot](Brew-Test-Bot) for this.
+We need to at least check that it builds. Use the [Brew Test Bot](Brew-Test-Bot.md) for this.
 
 Verify the formula works if possible. If you can’t tell (e.g. if it’s a
 library) trust the original contributor, it worked for them, so chances are it
diff --git a/docs/New-Maintainer-Checklist.md b/docs/New-Maintainer-Checklist.md
index d081131566..cb4919d697 100644
--- a/docs/New-Maintainer-Checklist.md
+++ b/docs/New-Maintainer-Checklist.md
@@ -59,6 +59,6 @@ If they accept, follow a few steps to get them set up:
 - Invite them to the [`homebrew` private maintainers 1Password](https://homebrew.1password.com/signin)
 - Invite them to [Google Analytics](https://analytics.google.com/analytics/web/?authuser=1#management/Settings/a76679469w115400090p120682403/%3Fm.page%3DAccountUsers/)
 
-After a month-long trial period with no problems make them [owners on the Homebrew GitHub organisation](https://github.com/orgs/Homebrew/people) and add them to [Homebrew's README](https://github.com/Homebrew/brew/edit/master/README). If there are problems, ask them to step down as a maintainer and revoke their access to the above.
+After a month-long trial period with no problems make them [owners on the Homebrew GitHub organisation](https://github.com/orgs/Homebrew/people) and add them to [Homebrew's README](https://github.com/Homebrew/brew/edit/master/README.md). If there are problems, ask them to step down as a maintainer and revoke their access to the above.
 
 Now sit back, relax and let the new maintainers handle more of our contributions.
diff --git a/docs/Node-for-Formula-Authors.md b/docs/Node-for-Formula-Authors.md
index 9252602ed8..4053706c16 100644
--- a/docs/Node-for-Formula-Authors.md
+++ b/docs/Node-for-Formula-Authors.md
@@ -82,7 +82,7 @@ In your formula's `install` method, do any installation steps which need to be d
 system "npm", "install", *Language::Node.local_npm_install_args
 ```
 
-This will install all of your Node modules dependencies to your local build path. You can now continue with your build steps and take care of the installation into the Homebrew `prefix` on your own, following the [general Homebrew formula instructions](Formula-Cookbook).
+This will install all of your Node modules dependencies to your local build path. You can now continue with your build steps and take care of the installation into the Homebrew `prefix` on your own, following the [general Homebrew formula instructions](Formula-Cookbook.md).
 
 ## Example
 
diff --git a/docs/README.md b/docs/README.md
index 5e90fe95a5..fe227291bb 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -1,46 +1,46 @@
 # Documentation
 
 ## Users
-- [`brew` man-page (command documentation)](Manpage)
-- [Troubleshooting](Troubleshooting)
-- [Installation](Installation)
-- [Frequently Asked Questions](FAQ)
-- [Common Issues](Common-Issues)
+- [`brew` man-page (command documentation)](Manpage.md)
+- [Troubleshooting](Troubleshooting.md)
+- [Installation](Installation.md)
+- [Frequently Asked Questions](FAQ.md)
+- [Common Issues](Common-Issues.md)
 
-- [Tips and Tricks](Tips-N'-Tricks)
-- [Bottles (binary packages)](Bottles)
-- [Taps (third-party repositories)](Taps)
-- [Interesting Taps and Forks](Interesting-Taps-and-Forks)
-- [Anonymous Aggregate User Behaviour Analytics](Analytics)
+- [Tips and Tricks](Tips-N'-Tricks.md)
+- [Bottles (binary packages)](Bottles.md)
+- [Taps (third-party repositories)](Taps.md)
+- [Interesting Taps and Forks](Interesting-Taps-and-Forks.md)
+- [Anonymous Aggregate User Behaviour Analytics](Analytics.md)
 
-- [Querying `brew`](Querying-Brew)
-- [C++ Standard Libraries](C++-Standard-Libraries)
-- [MD5 and SHA-1 Deprecation](Checksum_Deprecation)
-- [Custom GCC and Cross Compilers](Custom-GCC-and-cross-compilers)
-- [External Commands](External-Commands)
-- [Ruby Gems, Python Eggs and Perl Modules](Gems,-Eggs-and-Perl-Modules)
-- [Python](Homebrew-and-Python)
-- [How To Build Software Outside Homebrew With Homebrew `keg_only` dependencies](How-to-build-software-outside-Homebrew-with-Homebrew-keg-only-dependencies)
-- [Xcode](Xcode)
-- [Kickstarter Supporters](Kickstarter-Supporters)
+- [Querying `brew`](Querying-Brew.md)
+- [C++ Standard Libraries](C++-Standard-Libraries.md)
+- [MD5 and SHA-1 Deprecation](Checksum_Deprecation.md)
+- [Custom GCC and Cross Compilers](Custom-GCC-and-cross-compilers.md)
+- [External Commands](External-Commands.md)
+- [Ruby Gems, Python Eggs and Perl Modules](Gems,-Eggs-and-Perl-Modules.md)
+- [Python](Homebrew-and-Python.md)
+- [How To Build Software Outside Homebrew With Homebrew `keg_only` dependencies](How-to-build-software-outside-Homebrew-with-Homebrew-keg-only-dependencies.md)
+- [Xcode](Xcode.md)
+- [Kickstarter Supporters](Kickstarter-Supporters.md)
 
 ## Contributors
-- [How To Open A Pull Request (and get it merged)](How-To-Open-a-Homebrew-Pull-Request)
-- [Formula Cookbook](Formula-Cookbook)
-- [Acceptable Formulae](Acceptable-Formulae)
-- [Formulae Versions](Versions)
-- [Node for Formula Authors](Node-for-Formula-Authors)
-- [Python for Formula Authors](Python-for-Formula-Authors)
-- [Migrating A Formula To A Tap](Migrating-A-Formula-To-A-Tap)
-- [Rename A Formula](Rename-A-Formula)
-- [Building Against Non-Homebrew Dependencies](Building-Against-Non-Homebrew-Dependencies)
-- [How To Create (And Maintain) A Tap](How-to-Create-and-Maintain-a-Tap)
-- [Brew Test Bot](Brew-Test-Bot)
-- [Prose Style Guidelines](Prose-Style-Guidelines)
+- [How To Open A Pull Request (and get it merged)](How-To-Open-a-Homebrew-Pull-Request.md)
+- [Formula Cookbook](Formula-Cookbook.md)
+- [Acceptable Formulae](Acceptable-Formulae.md)
+- [Formulae Versions](Versions.md)
+- [Node for Formula Authors](Node-for-Formula-Authors.md)
+- [Python for Formula Authors](Python-for-Formula-Authors.md)
+- [Migrating A Formula To A Tap](Migrating-A-Formula-To-A-Tap.md)
+- [Rename A Formula](Rename-A-Formula.md)
+- [Building Against Non-Homebrew Dependencies](Building-Against-Non-Homebrew-Dependencies.md)
+- [How To Create (And Maintain) A Tap](How-to-Create-and-Maintain-a-Tap.md)
+- [Brew Test Bot](Brew-Test-Bot.md)
+- [Prose Style Guidelines](Prose-Style-Guidelines.md)
 
 ## Maintainers
-- [New Maintainer Checklist](New-Maintainer-Checklist)
-- [Maintainers: Avoiding Burnout](Maintainers-Avoiding-Burnout)
-- [Maintainer Guidelines](Maintainer-Guidelines)
-- [Brew Test Bot For Maintainers](Brew-Test-Bot-For-Core-Contributors)
-- [Common Issues for Maintainers](Common-Issues-for-Core-Contributors)
+- [New Maintainer Checklist](New-Maintainer-Checklist.md)
+- [Maintainers: Avoiding Burnout](Maintainers-Avoiding-Burnout.md)
+- [Maintainer Guidelines](Maintainer-Guidelines.md)
+- [Brew Test Bot For Maintainers](Brew-Test-Bot-For-Core-Contributors.md)
+- [Common Issues for Maintainers](Common-Issues-for-Core-Contributors.md)
diff --git a/docs/Tips-N'-Tricks.md b/docs/Tips-N'-Tricks.md
index a71a2ed372..a88940f0ef 100644
--- a/docs/Tips-N'-Tricks.md
+++ b/docs/Tips-N'-Tricks.md
@@ -3,7 +3,7 @@
 ## Installing previous versions of formulae
 
 The supported method of installing specific versions of
-some formulae is to see if there is a versioned formula (e.g. `gcc@6`) available. If the version you’re looking for isn’t available, consider [opening a pull request](How-To-Open-a-Homebrew-Pull-Request)!
+some formulae is to see if there is a versioned formula (e.g. `gcc@6`) available. If the version you’re looking for isn’t available, consider [opening a pull request](How-To-Open-a-Homebrew-Pull-Request.md)!
 
 ### Installing directly from pull requests
 You can [browse pull requests](https://github.com/Homebrew/homebrew-core/pulls)
diff --git a/docs/Troubleshooting.md b/docs/Troubleshooting.md
index 1bade44f22..8b1bd73127 100644
--- a/docs/Troubleshooting.md
+++ b/docs/Troubleshooting.md
@@ -12,7 +12,7 @@ Follow these steps to fix common problems:
 * Run `brew doctor` and fix all the warnings (**outdated Xcode/CLT and unbrewed dylibs are very likely to cause problems**).
 * Check that **Command Line Tools for Xcode (CLT)** and **Xcode** are up to date.
 * If commands fail with permissions errors, check the permissions of `/usr/local`'s subdirectories. If you’re unsure what to do, you can run `cd /usr/local && sudo chown -R $(whoami) bin etc include lib sbin share var Frameworks`.
-* Read through the [Common Issues](Common-Issues).
+* Read through the [Common Issues](Common-Issues.md).
 
 ## Check to see if the issue has been reported
 
diff --git a/docs/Versions.md b/docs/Versions.md
index 43a9595749..2fa3f563f5 100644
--- a/docs/Versions.md
+++ b/docs/Versions.md
@@ -18,6 +18,6 @@ Versioned formulae we include in [homebrew/core](https://github.com/homebrew/hom
 * Versioned formulae should be as similar as possible and sensible to the unversioned formulae. Creating or updating a versioned formula should be a chance to ask questions of the unversioned formula e.g. can some unused or useless options be removed or made default?
 * No more than five versions of a formula (including the non-versioned one) will be supported at any given time, regardless of usage. When removing formulae that violate this we will aim to do so based on usage and support status rather than age.
 
-Homebrew's versions are not intended to be used for any old versions you personally require for your project. You should create your own [tap](How-to-Create-and-Maintain-a-Tap) for formulae you or your organisation wish to control the versioning of or those that do not meet the above standards. Software that has regular API or ABI breaking releases still needs to meet all the above requirements; that a `brew upgrade` has broken something for you is not an argument for us to add and maintain a formula for you.
+Homebrew's versions are not intended to be used for any old versions you personally require for your project. You should create your own [tap](How-to-Create-and-Maintain-a-Tap.md) for formulae you or your organisation wish to control the versioning of or those that do not meet the above standards. Software that has regular API or ABI breaking releases still needs to meet all the above requirements; that a `brew upgrade` has broken something for you is not an argument for us to add and maintain a formula for you.
 
 We may temporarily add versioned formulae for our own needs that do not meet these standards in [homebrew/core](https://github.com/homebrew/homebrew-core). The presence of a versioned formula there does not imply it will be maintained indefinitely or that we are willing to accept any more versions that do not meet the requirements above.

From 650d6dbaac625a758881a215a35d8d4a248de5bf Mon Sep 17 00:00:00 2001
From: Mike McQuaid <mike@mikemcquaid.com>
Date: Fri, 23 Feb 2018 19:51:29 +0000
Subject: [PATCH 59/69] _config.yml: use extensionless permalinks.

---
 docs/_config.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/_config.yml b/docs/_config.yml
index d9514116e0..93518c6c55 100644
--- a/docs/_config.yml
+++ b/docs/_config.yml
@@ -12,6 +12,8 @@ plugins:
   - jekyll-sitemap
   - jekyll-seo-tag
 
+permalink: :title
+
 defaults:
   - scope:
       path: ""

From 72f4d054189d746bb40db44b565ca9c42f25a7a6 Mon Sep 17 00:00:00 2001
From: Mike McQuaid <mike@mikemcquaid.com>
Date: Mon, 26 Feb 2018 16:08:10 +0000
Subject: [PATCH 60/69] Handle a too old system Git on OS X 10.8 and below

Needed for GitHub since:
https://github.com/blog/2507-weak-cryptographic-standards-removed
---
 Library/Homebrew/brew.sh       | 8 ++++++++
 Library/Homebrew/cmd/update.sh | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/Library/Homebrew/brew.sh b/Library/Homebrew/brew.sh
index 61d85ddd2a..77a60dfc7f 100644
--- a/Library/Homebrew/brew.sh
+++ b/Library/Homebrew/brew.sh
@@ -96,6 +96,14 @@ then
     HOMEBREW_FORCE_BREWED_CURL="1"
   fi
 
+  # The system Git is too old for some GitHub's SSL ciphers on older
+  # macOS versions.
+  # https://github.com/blog/2507-weak-cryptographic-standards-removed
+  if [[ "$HOMEBREW_MACOS_VERSION_NUMERIC" -lt "100900" ]]
+  then
+    HOMEBREW_SYSTEM_GIT_TOO_OLD="1"
+  fi
+
   if [[ -z "$HOMEBREW_CACHE" ]]
   then
     HOMEBREW_CACHE="$HOME/Library/Caches/Homebrew"
diff --git a/Library/Homebrew/cmd/update.sh b/Library/Homebrew/cmd/update.sh
index 7477845274..cc7a86cf38 100644
--- a/Library/Homebrew/cmd/update.sh
+++ b/Library/Homebrew/cmd/update.sh
@@ -390,7 +390,7 @@ EOS
     brew install curl
   fi
 
-  if ! git --version >/dev/null 2>&1
+  if [[ -n "$HOMEBREW_SYSTEM_GIT_TOO_OLD" ]] || ! git --version >/dev/null 2>&1
   then
     # we cannot install brewed git if homebrew/core is unavailable.
     [[ -d "$HOMEBREW_LIBRARY/Taps/homebrew/homebrew-core" ]] && brew install git

From 430bb7c3a0688100370272d240891391f3bb915c Mon Sep 17 00:00:00 2001
From: Mike McQuaid <mike@mikemcquaid.com>
Date: Tue, 27 Feb 2018 10:41:16 +0000
Subject: [PATCH 61/69] update: tweak git too old check.

Avoid trying to install and warning if system Git is too old but Git
is already installed.
---
 Library/Homebrew/cmd/update.sh | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/Library/Homebrew/cmd/update.sh b/Library/Homebrew/cmd/update.sh
index cc7a86cf38..3f287340ff 100644
--- a/Library/Homebrew/cmd/update.sh
+++ b/Library/Homebrew/cmd/update.sh
@@ -390,12 +390,14 @@ EOS
     brew install curl
   fi
 
-  if [[ -n "$HOMEBREW_SYSTEM_GIT_TOO_OLD" ]] || ! git --version >/dev/null 2>&1
+  if ! git --version &>/dev/null ||
+       [[ -n "$HOMEBREW_SYSTEM_GIT_TOO_OLD" &&
+        ! -x "$HOMEBREW_PREFIX/opt/git/bin/git" ]]
   then
     # we cannot install brewed git if homebrew/core is unavailable.
     [[ -d "$HOMEBREW_LIBRARY/Taps/homebrew/homebrew-core" ]] && brew install git
     unset GIT_EXECUTABLE
-    if ! git --version >/dev/null 2>&1
+    if ! git --version &>/dev/null
     then
       odie "Git must be installed and in your PATH!"
     fi

From 9446eb661d46a761931275d26f553ff9d0313f90 Mon Sep 17 00:00:00 2001
From: Mike McQuaid <mike@mikemcquaid.com>
Date: Tue, 27 Feb 2018 11:52:47 +0000
Subject: [PATCH 62/69] brew.sh: HOMEBREW_DEVELOPERs can enable Ruby warnings.

It provides some useful helpers for when we're doing stupid things but
it's not something we want around by default.
---
 Library/Homebrew/brew.sh | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/Library/Homebrew/brew.sh b/Library/Homebrew/brew.sh
index 77a60dfc7f..590dde3632 100644
--- a/Library/Homebrew/brew.sh
+++ b/Library/Homebrew/brew.sh
@@ -253,6 +253,14 @@ then
   then
     export HOMEBREW_DEV_CMD_RUN="1"
   fi
+
+  # Don't allow non-developers to customise Ruby warnings.
+  unset HOMEBREW_RUBY_WARNINGS
+fi
+
+if [[ -z "$HOMEBREW_RUBY_WARNINGS" ]]
+then
+  export HOMEBREW_RUBY_WARNINGS="-W0"
 fi
 
 if [[ -f "$HOMEBREW_LIBRARY/Homebrew/cmd/$HOMEBREW_COMMAND.sh" ]]
@@ -371,5 +379,5 @@ else
 
   # Unshift command back into argument list (unless argument list was empty).
   [[ "$HOMEBREW_ARG_COUNT" -gt 0 ]] && set -- "$HOMEBREW_COMMAND" "$@"
-  { update-preinstall; exec "$HOMEBREW_RUBY_PATH" -W0 "$HOMEBREW_LIBRARY/Homebrew/brew.rb" "$@"; }
+  { update-preinstall; exec "$HOMEBREW_RUBY_PATH" $HOMEBREW_RUBY_WARNINGS "$HOMEBREW_LIBRARY/Homebrew/brew.rb" "$@"; }
 fi

From 6302da37f66fe9bb04e95fe67e8529fe0086187d Mon Sep 17 00:00:00 2001
From: Mike McQuaid <mike@mikemcquaid.com>
Date: Tue, 27 Feb 2018 12:07:30 +0000
Subject: [PATCH 63/69] Add prof and ruby commands.

These are imported from Homebrew/homebrew-dev-tools and are both used by
maintainers so may be useful for contributors too.
---
 Library/Homebrew/dev-cmd/prof.rb | 15 +++++++++++++++
 Library/Homebrew/dev-cmd/ruby.rb | 13 +++++++++++++
 docs/Manpage.md                  |  8 ++++++++
 manpages/brew.1                  |  8 ++++++++
 4 files changed, 44 insertions(+)
 create mode 100755 Library/Homebrew/dev-cmd/prof.rb
 create mode 100755 Library/Homebrew/dev-cmd/ruby.rb

diff --git a/Library/Homebrew/dev-cmd/prof.rb b/Library/Homebrew/dev-cmd/prof.rb
new file mode 100755
index 0000000000..c7121f6e85
--- /dev/null
+++ b/Library/Homebrew/dev-cmd/prof.rb
@@ -0,0 +1,15 @@
+#:  * `prof` [<ruby options>]:
+#:    Run Homebrew with the Ruby profiler.
+#:    For example:
+#       brew prof readall
+
+module Homebrew
+  module_function
+
+  def prof
+    Homebrew.install_gem_setup_path! "ruby-prof"
+    FileUtils.mkdir_p "prof"
+    brew_rb = (HOMEBREW_LIBRARY_PATH/"brew.rb").resolved_path
+    exec "ruby-prof", "--printer=multi", "--file=prof", brew_rb, "--", *ARGV
+  end
+end
diff --git a/Library/Homebrew/dev-cmd/ruby.rb b/Library/Homebrew/dev-cmd/ruby.rb
new file mode 100755
index 0000000000..2df2123014
--- /dev/null
+++ b/Library/Homebrew/dev-cmd/ruby.rb
@@ -0,0 +1,13 @@
+#:  * `ruby` [<ruby options>]:
+#:    Run a Ruby instance with Homebrew's libraries loaded.
+#:    For example:
+#       brew ruby -e "puts :gcc.f.deps"
+#       brew ruby script.rb
+
+module Homebrew
+  module_function
+
+  def ruby
+    exec ENV["HOMEBREW_RUBY_PATH"], "-I#{HOMEBREW_LIBRARY_PATH}", "-rglobal", "-rcmd/irb", *ARGV
+  end
+end
diff --git a/docs/Manpage.md b/docs/Manpage.md
index 91f9e0414d..6b6dc91ab3 100644
--- a/docs/Manpage.md
+++ b/docs/Manpage.md
@@ -782,6 +782,10 @@ With `--verbose` or `-v`, many commands print extra debugging information. Note
     Additionally, the date used in new manpages will match those in the existing
     manpages (to allow comparison without factoring in the date).
 
+  * `prof` [`ruby options`]:
+    Run Homebrew with the Ruby profiler.
+    For example:
+
   * `pull` [`--bottle`] [`--bump`] [`--clean`] [`--ignore-whitespace`] [`--resolve`] [`--branch-okay`] [`--no-pbcopy`] [`--no-publish`] [`--warn-on-publish-failure`] [`--bintray-org=``bintray-org`] [`--test-bot-user=``test-bot-user`] `patch-source` [`patch-source`]:
 
     Gets a patch from a GitHub commit or pull request and applies it to Homebrew.
@@ -839,6 +843,10 @@ With `--verbose` or `-v`, many commands print extra debugging information. Note
 
     If `--markdown` is passed, output as a Markdown list.
 
+  * `ruby` [`ruby options`]:
+    Run a Ruby instance with Homebrew's libraries loaded.
+    For example:
+
   * `tap-new` `user``/``repo`:
     Generate the template files for a new tap.
 
diff --git a/manpages/brew.1 b/manpages/brew.1
index 56ae23677b..0f99f3af6b 100644
--- a/manpages/brew.1
+++ b/manpages/brew.1
@@ -801,6 +801,10 @@ Generate Homebrew\'s manpages\.
 If \fB\-\-fail\-if\-changed\fR is passed, the command will return a failing status code if changes are detected in the manpage outputs\. This can be used for CI to be notified when the manpages are out of date\. Additionally, the date used in new manpages will match those in the existing manpages (to allow comparison without factoring in the date)\.
 .
 .TP
+\fBprof\fR [\fIruby options\fR]
+Run Homebrew with the Ruby profiler\. For example:
+.
+.TP
 \fBpull\fR [\fB\-\-bottle\fR] [\fB\-\-bump\fR] [\fB\-\-clean\fR] [\fB\-\-ignore\-whitespace\fR] [\fB\-\-resolve\fR] [\fB\-\-branch\-okay\fR] [\fB\-\-no\-pbcopy\fR] [\fB\-\-no\-publish\fR] [\fB\-\-warn\-on\-publish\-failure\fR] [\fB\-\-bintray\-org=\fR\fIbintray\-org\fR] [\fB\-\-test\-bot\-user=\fR\fItest\-bot\-user\fR] \fIpatch\-source\fR [\fIpatch\-source\fR]:
 .
 .IP
@@ -862,6 +866,10 @@ Output the merged pull requests on Homebrew/brew between two Git refs\. If no \f
 If \fB\-\-markdown\fR is passed, output as a Markdown list\.
 .
 .TP
+\fBruby\fR [\fIruby options\fR]
+Run a Ruby instance with Homebrew\'s libraries loaded\. For example:
+.
+.TP
 \fBtap\-new\fR \fIuser\fR\fB/\fR\fIrepo\fR
 Generate the template files for a new tap\.
 .

From 530889fdcb7deb9b4ad53788017b67dc1d74556c Mon Sep 17 00:00:00 2001
From: Mike McQuaid <mike@mikemcquaid.com>
Date: Tue, 27 Feb 2018 12:28:30 +0000
Subject: [PATCH 64/69] travis.yml: don't fetch/clone homebrew/core.

This is now done by `brew test-bot`.
---
 .travis.yml | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 37417a10a1..f83c20bd79 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -37,11 +37,6 @@ before_install:
       sudo rm -rf "$HOMEBREW_REPOSITORY";
       sudo ln -s "$PWD" "$HOMEBREW_REPOSITORY";
     fi
-  - if [ "$MACOS" ]; then
-      travis_retry git -C Library/Taps/homebrew/homebrew-core fetch --depth=1 origin;
-    else
-      travis_retry git clone --depth=1 https://github.com/Homebrew/homebrew-core Library/Taps/homebrew/homebrew-core;
-    fi
   - travis_retry git clone --depth=1 https://github.com/Homebrew/homebrew-test-bot Library/Taps/homebrew/homebrew-test-bot
 
 script:

From d4a3fc088f7baddf5a9bb1f9609987ffb4311046 Mon Sep 17 00:00:00 2001
From: Mike McQuaid <mike@mikemcquaid.com>
Date: Tue, 27 Feb 2018 14:29:55 +0000
Subject: [PATCH 65/69] travis.yml: fix bundler caching.

---
 .travis.yml                         | 2 +-
 Library/Homebrew/dev-cmd/tap-new.rb | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 37417a10a1..1c8524d81b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,7 +3,7 @@ cache:
   directories:
     - $HOME/Library/Caches/Homebrew/style
     - $HOME/Library/Caches/Homebrew/tests
-    - $HOME/Library/Homebrew/vendor/bundle
+    - Library/Homebrew/vendor/bundle
 branches:
   only:
     - master
diff --git a/Library/Homebrew/dev-cmd/tap-new.rb b/Library/Homebrew/dev-cmd/tap-new.rb
index 38cdb1c2e7..31299d2b0b 100644
--- a/Library/Homebrew/dev-cmd/tap-new.rb
+++ b/Library/Homebrew/dev-cmd/tap-new.rb
@@ -50,8 +50,7 @@ module Homebrew
       osx_image: xcode9.2
       cache:
         directories:
-          - $HOME/.gem/ruby
-          - Library/Homebrew/vendor/bundle
+          - /usr/local/Homebrew/Library/Homebrew/vendor/bundle
       branches:
         only:
           - master

From 04cec369c7f75d53136cf4eb46efb5fd184527b4 Mon Sep 17 00:00:00 2001
From: ilovezfs <ilovezfs@icloud.com>
Date: Wed, 28 Feb 2018 03:20:14 -0800
Subject: [PATCH 66/69] language/python: handle python@* in each_python

---
 Library/Homebrew/language/python.rb | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/Library/Homebrew/language/python.rb b/Library/Homebrew/language/python.rb
index 3908f4b8f4..648abb5b11 100644
--- a/Library/Homebrew/language/python.rb
+++ b/Library/Homebrew/language/python.rb
@@ -15,10 +15,11 @@ module Language
 
     def self.each_python(build, &block)
       original_pythonpath = ENV["PYTHONPATH"]
-      ["python", "python3"].each do |python|
-        next if build.without? python
+      { "python@3" => "python3", "python@2" => "python2.7" }.each do |python_formula, python|
+        python_formula = Formulary.factory(python_formula)
+        next if build.without? python_formula.to_s
         version = major_minor_version python
-        ENV["PYTHONPATH"] = if Formulary.factory(python).installed?
+        ENV["PYTHONPATH"] = if python_formula.installed?
           nil
         else
           homebrew_site_packages(version)

From 2205f62ec672643b845579f8687b0372b256f485 Mon Sep 17 00:00:00 2001
From: Mike McQuaid <mike@mikemcquaid.com>
Date: Wed, 28 Feb 2018 11:36:23 +0000
Subject: [PATCH 67/69] irb: add pry support.

Make `brew irb` optionally support `pry`. While doing so, also make it a `dev-cmd`.
---
 Library/Homebrew/{cmd => dev-cmd}/irb.rb | 34 +++++++++++++++++-------
 Library/Homebrew/extend/ARGV.rb          |  4 +++
 Library/Homebrew/manpages/brew.1.md.erb  |  9 ++++---
 docs/Manpage.md                          | 21 +++++++++------
 manpages/brew.1                          | 22 ++++++++-------
 5 files changed, 60 insertions(+), 30 deletions(-)
 rename Library/Homebrew/{cmd => dev-cmd}/irb.rb (57%)

diff --git a/Library/Homebrew/cmd/irb.rb b/Library/Homebrew/dev-cmd/irb.rb
similarity index 57%
rename from Library/Homebrew/cmd/irb.rb
rename to Library/Homebrew/dev-cmd/irb.rb
index 4cd3d4c9ec..700cbe0097 100644
--- a/Library/Homebrew/cmd/irb.rb
+++ b/Library/Homebrew/dev-cmd/irb.rb
@@ -1,11 +1,9 @@
-#:  * `irb` [`--examples`]:
+#:  * `irb` [`--examples`] [`--pry`]:
 #:    Enter the interactive Homebrew Ruby shell.
 #:
 #:    If `--examples` is passed, several examples will be shown.
-
-require "formula"
-require "keg"
-require "irb"
+#:    If `--pry` is passed or HOMEBREW_PRY is set, pry will be
+#:    used instead of irb.
 
 class Symbol
   def f(*args)
@@ -23,17 +21,33 @@ module Homebrew
   module_function
 
   def irb
-    $LOAD_PATH.unshift("#{HOMEBREW_LIBRARY_PATH}/cask/lib")
-    require "hbc"
-
     if ARGV.include? "--examples"
       puts "'v8'.f # => instance of the v8 formula"
       puts ":hub.f.installed?"
       puts ":lua.f.methods - 1.methods"
       puts ":mpd.f.recursive_dependencies.reject(&:installed?)"
+      return
+    end
+
+    if ARGV.pry?
+      Homebrew.install_gem_setup_path! "pry"
+      require "pry"
+      Pry.config.prompt_name = "brew"
+    else
+      require "irb"
+    end
+
+    require "formula"
+    require "keg"
+
+    $LOAD_PATH.unshift("#{HOMEBREW_LIBRARY_PATH}/cask/lib")
+    require "hbc"
+
+    ohai "Interactive Homebrew Shell"
+    puts "Example commands available with: brew irb --examples"
+    if ARGV.pry?
+      Pry.start
     else
-      ohai "Interactive Homebrew Shell"
-      puts "Example commands available with: brew irb --examples"
       IRB.start
     end
   end
diff --git a/Library/Homebrew/extend/ARGV.rb b/Library/Homebrew/extend/ARGV.rb
index d9da014f05..2bc84620a4 100644
--- a/Library/Homebrew/extend/ARGV.rb
+++ b/Library/Homebrew/extend/ARGV.rb
@@ -267,6 +267,10 @@ module HomebrewArgvExtension
     include? "--fetch-HEAD"
   end
 
+  def pry?
+    include?("--pry") || !ENV["HOMEBREW_PRY"].nil?
+  end
+
   # eg. `foo -ns -i --bar` has three switches, n, s and i
   def switch?(char)
     return false if char.length > 1
diff --git a/Library/Homebrew/manpages/brew.1.md.erb b/Library/Homebrew/manpages/brew.1.md.erb
index 533e1d5948..618e050f63 100644
--- a/Library/Homebrew/manpages/brew.1.md.erb
+++ b/Library/Homebrew/manpages/brew.1.md.erb
@@ -183,6 +183,10 @@ can take several different forms:
 
     *Note:* Homebrew doesn't require permissions for any of the scopes.
 
+  * `HOMEBREW_INSTALL_BADGE`:
+    Text printed before the installation summary of each successful build.
+    Defaults to the beer emoji.
+
   * `HOMEBREW_LOGS`:
     If set, Homebrew will use the given directory to store log files.
 
@@ -220,9 +224,8 @@ can take several different forms:
     If set, Homebrew will not use the GitHub API for e.g searches or
     fetching relevant issues on a failed install.
 
-  * `HOMEBREW_INSTALL_BADGE`:
-    Text printed before the installation summary of each successful build.
-    Defaults to the beer emoji.
+  * `HOMEBREW_PRY`:
+    If set, Homebrew will use `pry` for the `brew irb` command.
 
   * `HOMEBREW_SVN`:
     When exporting from Subversion, Homebrew will use `HOMEBREW_SVN` if set,
diff --git a/docs/Manpage.md b/docs/Manpage.md
index 6b6dc91ab3..ff33466856 100644
--- a/docs/Manpage.md
+++ b/docs/Manpage.md
@@ -280,11 +280,6 @@ With `--verbose` or `-v`, many commands print extra debugging information. Note
     If `--git` (or `-g`) is passed, Homebrew will create a Git repository, useful for
     creating patches to the software.
 
-  * `irb` [`--examples`]:
-    Enter the interactive Homebrew Ruby shell.
-
-    If `--examples` is passed, several examples will be shown.
-
   * `leaves`:
     Show installed formulae that are not dependencies of another installed formula.
 
@@ -761,6 +756,13 @@ With `--verbose` or `-v`, many commands print extra debugging information. Note
   * `formula` `formula`:
     Display the path where `formula` is located.
 
+  * `irb` [`--examples`] [`--pry`]:
+    Enter the interactive Homebrew Ruby shell.
+
+    If `--examples` is passed, several examples will be shown.
+    If `--pry` is passed or HOMEBREW_PRY is set, pry will be
+    used instead of irb.
+
   * `linkage` [`--test`] [`--reverse`] `formula`:
     Checks the library links of an installed formula.
 
@@ -1029,6 +1031,10 @@ can take several different forms:
 
     *Note:* Homebrew doesn't require permissions for any of the scopes.
 
+  * `HOMEBREW_INSTALL_BADGE`:
+    Text printed before the installation summary of each successful build.
+    Defaults to the beer emoji.
+
   * `HOMEBREW_LOGS`:
     If set, Homebrew will use the given directory to store log files.
 
@@ -1066,9 +1072,8 @@ can take several different forms:
     If set, Homebrew will not use the GitHub API for e.g searches or
     fetching relevant issues on a failed install.
 
-  * `HOMEBREW_INSTALL_BADGE`:
-    Text printed before the installation summary of each successful build.
-    Defaults to the beer emoji.
+  * `HOMEBREW_PRY`:
+    If set, Homebrew will use `pry` for the `brew irb` command.
 
   * `HOMEBREW_SVN`:
     When exporting from Subversion, Homebrew will use `HOMEBREW_SVN` if set,
diff --git a/manpages/brew.1 b/manpages/brew.1
index 0f99f3af6b..60cd7cc808 100644
--- a/manpages/brew.1
+++ b/manpages/brew.1
@@ -291,13 +291,6 @@ If \fB\-\-interactive\fR (or \fB\-i\fR) is passed, download and patch \fIformula
 If \fB\-\-git\fR (or \fB\-g\fR) is passed, Homebrew will create a Git repository, useful for creating patches to the software\.
 .
 .TP
-\fBirb\fR [\fB\-\-examples\fR]
-Enter the interactive Homebrew Ruby shell\.
-.
-.IP
-If \fB\-\-examples\fR is passed, several examples will be shown\.
-.
-.TP
 \fBleaves\fR
 Show installed formulae that are not dependencies of another installed formula\.
 .
@@ -781,6 +774,13 @@ Open \fIformula\fR in the editor\.
 Display the path where \fIformula\fR is located\.
 .
 .TP
+\fBirb\fR [\fB\-\-examples\fR] [\fB\-\-pry\fR]
+Enter the interactive Homebrew Ruby shell\.
+.
+.IP
+If \fB\-\-examples\fR is passed, several examples will be shown\. If \fB\-\-pry\fR is passed or HOMEBREW_PRY is set, pry will be used instead of irb\.
+.
+.TP
 \fBlinkage\fR [\fB\-\-test\fR] [\fB\-\-reverse\fR] \fIformula\fR
 Checks the library links of an installed formula\.
 .
@@ -1048,6 +1048,10 @@ A personal access token for the GitHub API, which you can create at \fIhttps://g
 \fINote:\fR Homebrew doesn\'t require permissions for any of the scopes\.
 .
 .TP
+\fBHOMEBREW_INSTALL_BADGE\fR
+Text printed before the installation summary of each successful build\. Defaults to the beer emoji\.
+.
+.TP
 \fBHOMEBREW_LOGS\fR
 If set, Homebrew will use the given directory to store log files\.
 .
@@ -1089,8 +1093,8 @@ While ensuring your downloads are fully secure, this is likely to cause from\-so
 If set, Homebrew will not use the GitHub API for e\.g searches or fetching relevant issues on a failed install\.
 .
 .TP
-\fBHOMEBREW_INSTALL_BADGE\fR
-Text printed before the installation summary of each successful build\. Defaults to the beer emoji\.
+\fBHOMEBREW_PRY\fR
+If set, Homebrew will use \fBpry\fR for the \fBbrew irb\fR command\.
 .
 .TP
 \fBHOMEBREW_SVN\fR

From db615a419afb99f186fb6df7c859f7538a7524ba Mon Sep 17 00:00:00 2001
From: Steven Peters <scpeters@openrobotics.org>
Date: Wed, 28 Feb 2018 09:31:29 -0800
Subject: [PATCH 68/69] dev-cmd/ruby: fix path to dev-cmd/irb and add test

---
 Library/Homebrew/dev-cmd/ruby.rb           |  2 +-
 Library/Homebrew/test/dev-cmd/ruby_spec.rb | 13 +++++++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)
 create mode 100644 Library/Homebrew/test/dev-cmd/ruby_spec.rb

diff --git a/Library/Homebrew/dev-cmd/ruby.rb b/Library/Homebrew/dev-cmd/ruby.rb
index 2df2123014..c5696d6bba 100755
--- a/Library/Homebrew/dev-cmd/ruby.rb
+++ b/Library/Homebrew/dev-cmd/ruby.rb
@@ -8,6 +8,6 @@ module Homebrew
   module_function
 
   def ruby
-    exec ENV["HOMEBREW_RUBY_PATH"], "-I#{HOMEBREW_LIBRARY_PATH}", "-rglobal", "-rcmd/irb", *ARGV
+    exec ENV["HOMEBREW_RUBY_PATH"], "-I#{HOMEBREW_LIBRARY_PATH}", "-rglobal", "-rdev-cmd/irb", *ARGV
   end
 end
diff --git a/Library/Homebrew/test/dev-cmd/ruby_spec.rb b/Library/Homebrew/test/dev-cmd/ruby_spec.rb
new file mode 100644
index 0000000000..e05bccc833
--- /dev/null
+++ b/Library/Homebrew/test/dev-cmd/ruby_spec.rb
@@ -0,0 +1,13 @@
+describe "brew ruby", :integration_test do
+  it "executes ruby code with Homebrew's libraries loaded" do
+    expect { brew "ruby", "-e", "exit 0" }
+      .to be_a_success
+      .and not_to_output.to_stdout
+      .and not_to_output.to_stderr
+
+    expect { brew "ruby", "-e", "exit 1" }
+      .to be_a_failure
+      .and not_to_output.to_stdout
+      .and not_to_output.to_stderr
+  end
+end

From 97932c1abfbeeeeb57c36de3382451d7167d7c7b Mon Sep 17 00:00:00 2001
From: Shaun Jackman <sjackman@gmail.com>
Date: Wed, 28 Feb 2018 09:13:17 -0800
Subject: [PATCH 69/69] Move linkage_checker from os/mac to generic

---
 Library/Homebrew/dev-cmd/linkage.rb                     | 2 +-
 Library/Homebrew/extend/os/mac/formula_cellar_checks.rb | 2 +-
 Library/Homebrew/{os/mac => }/linkage_checker.rb        | 0
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename Library/Homebrew/{os/mac => }/linkage_checker.rb (100%)

diff --git a/Library/Homebrew/dev-cmd/linkage.rb b/Library/Homebrew/dev-cmd/linkage.rb
index 31e9bd1036..c33c181a1e 100644
--- a/Library/Homebrew/dev-cmd/linkage.rb
+++ b/Library/Homebrew/dev-cmd/linkage.rb
@@ -10,7 +10,7 @@
 #:    If `--reverse` is passed, print the dylib followed by the binaries
 #:    which link to it for each library the keg references.
 
-require "os/mac/linkage_checker"
+require "linkage_checker"
 
 module Homebrew
   module_function
diff --git a/Library/Homebrew/extend/os/mac/formula_cellar_checks.rb b/Library/Homebrew/extend/os/mac/formula_cellar_checks.rb
index 901d8945fe..0b1a1643e1 100644
--- a/Library/Homebrew/extend/os/mac/formula_cellar_checks.rb
+++ b/Library/Homebrew/extend/os/mac/formula_cellar_checks.rb
@@ -1,4 +1,4 @@
-require "os/mac/linkage_checker"
+require "linkage_checker"
 
 module FormulaCellarChecks
   def check_shadowed_headers
diff --git a/Library/Homebrew/os/mac/linkage_checker.rb b/Library/Homebrew/linkage_checker.rb
similarity index 100%
rename from Library/Homebrew/os/mac/linkage_checker.rb
rename to Library/Homebrew/linkage_checker.rb