cask reinstall: use fetch and stage steps from #1620

This commit is contained in:
Raymond Wanyoike 2016-12-05 12:08:55 +03:00
parent 55ef924e7a
commit 0d67e35fb7

View File

@ -12,19 +12,8 @@ module Hbc
skip_cask_deps: skip_cask_deps,
require_sha: require_sha)
installer.print_caveats
installer.fetch
# Download
begin
installer.satisfy_dependencies
installer.verify_has_sha if @require_sha && !@force
installer.download
installer.verify
rescue StandardError => e
installer.purge_versioned_files
raise e
end
# Uninstall
if cask.installed?
# use copy of cask for uninstallation to avoid 'No such file or directory' bug
installed_cask = cask
@ -44,18 +33,11 @@ module Hbc
Installer.new(installed_cask, force: true).uninstall
end
# Reinstall
begin
installer.extract_primary_container
installer.install_artifacts
installer.save_caskfile
installer.enable_accessibility_access
rescue StandardError => e
installer.purge_versioned_files
raise e
end
installer.stage
installer.install_artifacts
installer.enable_accessibility_access
puts installer.summary
count += 1
rescue CaskUnavailableError => e
warn_unavailable_with_suggestion cask_token, e