Fix uninstall order.
This commit is contained in:
parent
0871e069a2
commit
38b5e4254b
@ -25,10 +25,17 @@ require "hbc/artifact/zap"
|
||||
|
||||
module Hbc
|
||||
module Artifact
|
||||
# NOTE: order is important here, since we want to extract nested containers
|
||||
# before we handle any other artifacts
|
||||
# NOTE: Order is important here!
|
||||
#
|
||||
# The `uninstall` stanza should be run first, as it may
|
||||
# depend on other artifacts still being installed.
|
||||
#
|
||||
# We want to extract nested containers before we
|
||||
# handle any other artifacts.
|
||||
#
|
||||
TYPES = [
|
||||
PreflightBlock,
|
||||
Uninstall,
|
||||
NestedContainer,
|
||||
Installer,
|
||||
App,
|
||||
@ -49,7 +56,6 @@ module Hbc
|
||||
VstPlugin,
|
||||
Vst3Plugin,
|
||||
ScreenSaver,
|
||||
Uninstall,
|
||||
PostflightBlock,
|
||||
Zap,
|
||||
].freeze
|
||||
|
||||
@ -358,10 +358,6 @@ module Hbc
|
||||
odebug "Un-installing artifacts"
|
||||
artifacts = Artifact.for_cask(@cask, command: @command, verbose: verbose?, force: force?)
|
||||
|
||||
# Make sure the `uninstall` stanza is run first, as it
|
||||
# may depend on other artifacts still being installed.
|
||||
artifacts = artifacts.sort_by { |a| a.is_a?(Artifact::Uninstall) ? -1 : 1 }
|
||||
|
||||
odebug "#{artifacts.length} artifact/s defined", artifacts
|
||||
|
||||
artifacts.each do |artifact|
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user