From 367fdb971839c0b3686ca23a6de76da75cc80580 Mon Sep 17 00:00:00 2001
From: Joshua McKinney
Date: Sat, 18 Mar 2017 17:48:20 -0500
Subject: Refactor brew cask reinstall

The implementation of the reinstall command was the same as
Installer#install, aside from the uninstall of the existing cask.
Moved this within the class to DRY up the implementation.
---
 Library/Homebrew/cask/lib/hbc/cli/reinstall.rb | 29 +++++---------------------
 1 file changed, 5 insertions(+), 24 deletions(-)

(limited to 'Library/Homebrew/cask/lib/hbc/cli')

diff --git a/Library/Homebrew/cask/lib/hbc/cli/reinstall.rb b/Library/Homebrew/cask/lib/hbc/cli/reinstall.rb
index b52c43328..c27fa9f2f 100644
--- a/Library/Homebrew/cask/lib/hbc/cli/reinstall.rb
+++ b/Library/Homebrew/cask/lib/hbc/cli/reinstall.rb
@@ -7,30 +7,11 @@ module Hbc
           begin
             cask = CaskLoader.load(cask_token)
 
-            installer = Installer.new(cask,
-                                      force:          force,
-                                      skip_cask_deps: skip_cask_deps,
-                                      require_sha:    require_sha)
-            installer.print_caveats
-            installer.fetch
-
-            if cask.installed?
-              # use copy of cask for uninstallation to avoid 'No such file or directory' bug
-              installed_cask = cask
-
-              # use the same cask file that was used for installation, if possible
-              if (installed_caskfile = installed_cask.installed_caskfile).exist?
-                installed_cask = CaskLoader.load_from_file(installed_caskfile)
-              end
-
-              # Always force uninstallation, ignore method parameter
-              Installer.new(installed_cask, force: true).uninstall
-            end
-
-            installer.stage
-            installer.install_artifacts
-            installer.enable_accessibility_access
-            puts installer.summary
+            Installer.new(cask,
+                          force:          force,
+                          skip_cask_deps: skip_cask_deps,
+                          require_sha:    require_sha,
+                          reinstall:      true).install
 
             count += 1
           rescue CaskUnavailableError => e
-- 
cgit v1.2.3


From a90d1e169939cea7006f7465fe8c04370005223d Mon Sep 17 00:00:00 2001
From: Joshua McKinney
Date: Mon, 27 Mar 2017 01:31:29 -0500
Subject: Installer#reinstall instead of #install :reinstall

Call an explicit method on Installer to reinstall rather than using a
flag to indicate when we're reinstalling a cask
---
 Library/Homebrew/cask/lib/hbc/cli/reinstall.rb | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'Library/Homebrew/cask/lib/hbc/cli')

diff --git a/Library/Homebrew/cask/lib/hbc/cli/reinstall.rb b/Library/Homebrew/cask/lib/hbc/cli/reinstall.rb
index c27fa9f2f..c2ed8f462 100644
--- a/Library/Homebrew/cask/lib/hbc/cli/reinstall.rb
+++ b/Library/Homebrew/cask/lib/hbc/cli/reinstall.rb
@@ -10,8 +10,7 @@ module Hbc
             Installer.new(cask,
                           force:          force,
                           skip_cask_deps: skip_cask_deps,
-                          require_sha:    require_sha,
-                          reinstall:      true).install
+                          require_sha:    require_sha).reinstall
 
             count += 1
           rescue CaskUnavailableError => e
-- 
cgit v1.2.3