admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

Installer#reinstall instead of #install :reinstall

Browse Source 
Call an explicit method on Installer to reinstall rather than using a
flag to indicate when we're reinstalling a cask
This commit is contained in:
Joshua McKinney 2017-03-27 01:31:29 -05:00
parent 437db065ca
commit a90d1e1699
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Library/Homebrew/cask/lib/hbc/cli/reinstall.rb
View File

@ -10,8 +10,7 @@ module Hbc
Installer.new(cask, Installer.new(cask,
force: force, force: force,
skip_cask_deps: skip_cask_deps, skip_cask_deps: skip_cask_deps,
require_sha: require_sha, require_sha: require_sha).reinstall
reinstall: true).install
count += 1 count += 1
rescue CaskUnavailableError => e rescue CaskUnavailableError => e

10
Library/Homebrew/cask/lib/hbc/installer.rb
View File

@ -18,13 +18,13 @@ module Hbc
PERSISTENT_METADATA_SUBDIRS = ["gpg"].freeze PERSISTENT_METADATA_SUBDIRS = ["gpg"].freeze
def initialize(cask, command: SystemCommand, force: false, skip_cask_deps: false, require_sha: false, reinstall: false) def initialize(cask, command: SystemCommand, force: false, skip_cask_deps: false, require_sha: false)
@cask = cask @cask = cask
@command = command @command = command
@force = force @force = force
@skip_cask_deps = skip_cask_deps @skip_cask_deps = skip_cask_deps
@require_sha = require_sha @require_sha = require_sha
@reinstall = reinstall @reinstall = false
end end
def self.print_caveats(cask) def self.print_caveats(cask)
@ -94,6 +94,12 @@ module Hbc
puts summary puts summary
end end
def reinstall
odebug "Hbc::Installer#reinstall"
@reinstall = true
install
end
def uninstall_if_neccessary def uninstall_if_neccessary
return unless @cask.installed? && @reinstall return unless @cask.installed? && @reinstall
installed_cask = @cask installed_cask = @cask