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

Implement @reitermarkus's upgrade flow

Browse Source
This commit is contained in:
L. E. Segovia 2017-11-11 17:21:13 -03:00
parent 72e673afae
commit 8cc1aea5f0
2 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Library/Homebrew/cask/lib/hbc/cli/upgrade.rb
View File

@ -21,8 +21,7 @@ module Hbc
puts outdated_casks.map { |f| "#{f.full_name} #{f.version}" } * ", " puts outdated_casks.map { |f| "#{f.full_name} #{f.version}" } * ", "
outdated_casks.each do |old_cask| outdated_casks.each do |old_cask|
odebug "Uninstalling Cask #{old_cask}" odebug "Started upgrade process for Cask #{old_cask}"
raise CaskNotInstalledError, old_cask unless old_cask.installed? || force? raise CaskNotInstalledError, old_cask unless old_cask.installed? || force?
unless old_cask.installed_caskfile.nil? unless old_cask.installed_caskfile.nil?
@ -43,17 +42,26 @@ module Hbc
upgrade: true) upgrade: true)
begin begin
# purge artifacts BUT keep metadata aside # Start new Cask's installation steps
new_cask_installer.check_conflicts
new_cask_installer.fetch
new_cask_installer.stage
# Move the old Cask's artifacts back to staging
old_cask_installer.start_upgrade old_cask_installer.start_upgrade
# install BUT do not yet save metadata # Install the new Cask
new_cask_installer.install_artifacts
new_cask_installer.install new_cask_installer.enable_accessibility_access
# if successful, remove old metadata and install new # If successful, wipe the old Cask from staging
old_cask_installer.finalize_upgrade old_cask_installer.finalize_upgrade
rescue CaskError => e rescue CaskError => e
opoo e.message opoo e.message
new_cask_installer.uninstall
old_cask_installer.revert_upgrade old_cask_installer.revert_upgrade
end end
end end

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

@ -391,6 +391,8 @@ module Hbc
def finalize_upgrade def finalize_upgrade
return unless upgrade? return unless upgrade?
purge_versioned_files purge_versioned_files
puts summary
end end
def uninstall_artifacts(clear: false) def uninstall_artifacts(clear: false)