2 files changed, 21 insertions, 2 deletions
diff --git a/Library/Homebrew/compat/hbc/cli.rb b/Library/Homebrew/compat/hbc/cli.rb
new file mode 100644
index 000000000..0173bce9c
--- /dev/null
+++ b/Library/Homebrew/compat/hbc/cli.rb
@@ -0,0 +1,19 @@
+require "cask/lib/hbc/cli/options"
+
+module Hbc
+  class CLI
+    include Options
+
+    option "--binarydir=PATH", (lambda do |*|
+      opoo <<-EOS.undent
+        Option --binarydir is obsolete!
+        Homebrew-Cask now uses the same location as your Homebrew installation for executable links.
+      EOS
+    end)
+
+    option "--caskroom=PATH", (lambda do |value|
+      Hbc.caskroom = value
+      odeprecated "`brew cask` with the `--caskroom` flag", disable_on: Time.utc(2017, 10, 31)
+    end)
+  end
+end
diff --git a/Library/Homebrew/compat/hbc/cli/update.rb b/Library/Homebrew/compat/hbc/cli/update.rb
index 7820997cb..95321e898 100644
--- a/Library/Homebrew/compat/hbc/cli/update.rb
+++ b/Library/Homebrew/compat/hbc/cli/update.rb
@@ -1,8 +1,8 @@
-require "cask/lib/hbc/cli/base"
+require "cask/lib/hbc/cli/abstract_command"
 
 module Hbc
   class CLI
-    class Update < Base
+    class Update < AbstractCommand
       def self.run(*_ignored)
         odeprecated "`brew cask update`", "`brew update`", disable_on: Time.utc(2017, 7, 1)
         result = SystemCommand.run(HOMEBREW_BREW_FILE, args:         ["update"],