From bd9755fd78c4480dfb393c8317f685ec770e076a Mon Sep 17 00:00:00 2001 From: Markus Reiter Date: Mon, 14 Nov 2016 12:33:57 +0100 Subject: [PATCH] Load cask file in `.metadata` directory directly. --- Library/Homebrew/cask/lib/hbc/cli/reinstall.rb | 2 +- Library/Homebrew/cask/lib/hbc/cli/uninstall.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Library/Homebrew/cask/lib/hbc/cli/reinstall.rb b/Library/Homebrew/cask/lib/hbc/cli/reinstall.rb index ac514bd506..3560a4795b 100644 --- a/Library/Homebrew/cask/lib/hbc/cli/reinstall.rb +++ b/Library/Homebrew/cask/lib/hbc/cli/reinstall.rb @@ -19,7 +19,7 @@ module Hbc "Casks", "#{cask_token}.rb") # use the same cask file that was used for installation, if possible - installed_cask = Hbc.load(latest_installed_cask_file) if latest_installed_cask_file.exist? + installed_cask = CaskLoader.load_from_file(latest_installed_cask_file) if latest_installed_cask_file.exist? end # Always force uninstallation, ignore method parameter diff --git a/Library/Homebrew/cask/lib/hbc/cli/uninstall.rb b/Library/Homebrew/cask/lib/hbc/cli/uninstall.rb index 2bebb97b09..d74b59d4c6 100644 --- a/Library/Homebrew/cask/lib/hbc/cli/uninstall.rb +++ b/Library/Homebrew/cask/lib/hbc/cli/uninstall.rb @@ -20,7 +20,7 @@ module Hbc "Casks", "#{cask_token}.rb") # use the same cask file that was used for installation, if possible - cask = Hbc.load(latest_installed_cask_file) if latest_installed_cask_file.exist? + cask = CaskLoader.load_from_file(latest_installed_cask_file) if latest_installed_cask_file.exist? end Installer.new(cask, force: force).uninstall