From cea1d18f45608dda5d3185659b790df1c5d1b4e7 Mon Sep 17 00:00:00 2001
From: Markus Reiter <me@reitermark.us>
Date: Fri, 30 Dec 2016 16:13:09 +0100
Subject: [PATCH] =?UTF-8?q?Do=20not=20require=20`compat/hbc/cli/update`=20?=
=?UTF-8?q?when=20`=E2=80=94no-compat`=20is=20specified.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
Library/Homebrew/cask/lib/hbc/cli.rb | 2 +-
Library/Homebrew/cask/lib/hbc/locations.rb | 2 ++
Library/Homebrew/compat/hbc.rb | 1 +
Library/Homebrew/compat/hbc/cli/update.rb | 2 ++
4 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/Library/Homebrew/cask/lib/hbc/cli.rb b/Library/Homebrew/cask/lib/hbc/cli.rb
index f1057566ef..42c3982ba8 100644
--- a/Library/Homebrew/cask/lib/hbc/cli.rb
+++ b/Library/Homebrew/cask/lib/hbc/cli.rb
@@ -19,7 +19,6 @@ require "hbc/cli/reinstall"
require "hbc/cli/search"
require "hbc/cli/style"
require "hbc/cli/uninstall"
-require "compat/hbc/cli/update"
require "hbc/cli/zap"
require "hbc/cli/internal_use_base"
@@ -77,6 +76,7 @@ module Hbc
def self.command_classes
@command_classes ||= constants.map(&method(:const_get))
.select { |sym| sym.respond_to?(:run) }
+ .sort_by(&:command_name)
end
def self.commands
diff --git a/Library/Homebrew/cask/lib/hbc/locations.rb b/Library/Homebrew/cask/lib/hbc/locations.rb
index f28e84b2ef..292b45d0ca 100644
--- a/Library/Homebrew/cask/lib/hbc/locations.rb
+++ b/Library/Homebrew/cask/lib/hbc/locations.rb
@@ -1,3 +1,5 @@
+require "tap"
+
module Hbc
module Locations
def self.included(base)
diff --git a/Library/Homebrew/compat/hbc.rb b/Library/Homebrew/compat/hbc.rb
index a1d1414a59..179639953e 100644
--- a/Library/Homebrew/compat/hbc.rb
+++ b/Library/Homebrew/compat/hbc.rb
@@ -1 +1,2 @@
require "compat/hbc/cask_loader"
+require "compat/hbc/cli/update"
diff --git a/Library/Homebrew/compat/hbc/cli/update.rb b/Library/Homebrew/compat/hbc/cli/update.rb
index ab161ea652..80f9612280 100644
--- a/Library/Homebrew/compat/hbc/cli/update.rb
+++ b/Library/Homebrew/compat/hbc/cli/update.rb
@@ -1,3 +1,5 @@
+require "cask/lib/hbc/cli/base"
+
module Hbc
class CLI
class Update < Base
--
GitLab