Skip setup + teardown for macOS 11+ packages

This commit is contained in:
Nindi Gill 2022-11-03 22:17:19 +11:00
parent 91f7f7f454
commit 378734c0ab

View file

@ -163,13 +163,18 @@ class TaskManager: ObservableObject {
( (
section: .download, section: .download,
tasks: try downloadTasks(for: installer, cacheDirectory: cacheDirectoryURL, retries: retries, delay: retryDelay) 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) { if exports.contains(.application) {
taskGroups += [ taskGroups += [
( (
@ -208,12 +213,14 @@ class TaskManager: ObservableObject {
] ]
} }
taskGroups += [ if !installer.bigSurOrNewer || exports != [.package] {
( taskGroups += [
section: .cleanup, (
tasks: cleanupTasks(mountPoint: mountPointURL, temporaryDirectory: temporaryDirectoryURL, cacheDownloads: cacheDownloads, cacheDirectory: cacheDirectoryURL) section: .cleanup,
) tasks: cleanupTasks(mountPoint: mountPointURL, temporaryDirectory: temporaryDirectoryURL, cacheDownloads: cacheDownloads, cacheDirectory: cacheDirectoryURL)
] )
]
}
return taskGroups return taskGroups
} }