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

Refactor uninstall existing cask

Browse Source
This commit is contained in:
Joshua McKinney 2017-04-17 17:21:02 -07:00
parent a90d1e1699
commit cb28ab640e
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -84,7 +84,7 @@ module Hbc
print_caveats
fetch
uninstall_if_neccessary
uninstall_existing_cask if @reinstall
oh1 "Installing Cask #{@cask}"
stage
@ -100,14 +100,12 @@ module Hbc
install
end
def uninstall_if_neccessary
return unless @cask.installed? && @reinstall
installed_cask = @cask
def uninstall_existing_cask
return unless @cask.installed?
# 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
installed_caskfile = @cask.installed_caskfile
installed_cask = installed_caskfile.exist? ? CaskLoader.load_from_file(installed_caskfile) : @cask
# Always force uninstallation, ignore method parameter
Installer.new(installed_cask, force: true).uninstall