From 378734c0ab89c6fe569b7db4d3c48cea0d973cf1 Mon Sep 17 00:00:00 2001 From: Nindi Gill Date: Thu, 3 Nov 2022 22:17:19 +1100 Subject: [PATCH] Skip setup + teardown for macOS 11+ packages --- Mist/Helpers/TaskManager.swift | 27 +++++++++++++++++---------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/Mist/Helpers/TaskManager.swift b/Mist/Helpers/TaskManager.swift index 8a90832..de27903 100644 --- a/Mist/Helpers/TaskManager.swift +++ b/Mist/Helpers/TaskManager.swift @@ -163,13 +163,18 @@ class TaskManager: ObservableObject { ( section: .download, tasks: try downloadTasks(for: installer, cacheDirectory: cacheDirectoryURL, retries: retries, delay: retryDelay) - ), - ( - section: .setup, - tasks: installTasks(for: installer, temporaryDirectory: temporaryDirectoryURL, mountPoint: mountPointURL, cacheDirectory: cacheDirectory) ) ] + if !installer.bigSurOrNewer || exports != [.package] { + taskGroups += [ + ( + section: .setup, + tasks: installTasks(for: installer, temporaryDirectory: temporaryDirectoryURL, mountPoint: mountPointURL, cacheDirectory: cacheDirectory) + ) + ] + } + if exports.contains(.application) { taskGroups += [ ( @@ -208,12 +213,14 @@ class TaskManager: ObservableObject { ] } - taskGroups += [ - ( - section: .cleanup, - tasks: cleanupTasks(mountPoint: mountPointURL, temporaryDirectory: temporaryDirectoryURL, cacheDownloads: cacheDownloads, cacheDirectory: cacheDirectoryURL) - ) - ] + if !installer.bigSurOrNewer || exports != [.package] { + taskGroups += [ + ( + section: .cleanup, + tasks: cleanupTasks(mountPoint: mountPointURL, temporaryDirectory: temporaryDirectoryURL, cacheDownloads: cacheDownloads, cacheDirectory: cacheDirectoryURL) + ) + ] + } return taskGroups }