VladPolskiy/nextcloud-desktop
1
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2025-07-30 13:00:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat(mac-crafter): Update to Swift 6.1 and Strict Concurrency Checks.

Browse Source 
- Isolated global state into an actor.
- Updated declarations and calls to reflect asynchronicity.
- The replacement of the enumerator with subpathsOfDirectory(atPath:) was suggested by Copilot to necessarily avoid the use of synchronous enumeration in an asynchronous context.
- Updated README.

Signed-off-by: Iva Horn <iva.horn@icloud.com>
This commit is contained in:
Iva Horn
2025-07-11 13:37:36 +02:00
parent a334ebc1f1
commit e93e23f0a7
8 changed files with 192 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

69
admin/osx/mac-crafter/Sources/Utils/Shell.swift
View File

@ -1,12 +1,21 @@
/*
* SPDX-FileCopyrightText: 2024 Nextcloud GmbH and Nextcloud contributors
* SPDX-License-Identifier: GPL-2.0-or-later
*/
// SPDX-FileCopyrightText: Nextcloud GmbH
// SPDX-FileCopyrightText: 2024 Claudio Cambra
// SPDX-FileCopyrightText: 2025 Iva Horn
// SPDX-License-Identifier: GPL-2.0-or-later
import Foundation
weak var globalTaskRef: Process?
///
/// Run a shell command.
///
/// - Parameters:
/// - launchPath: The command to run.
/// - args: Arguments to pass.
/// - env: Environment variables to pass for this specific command.
/// - quiet: Whether the standard and error output of the command should be printed or omitted.
///
/// - Returns: Exit code of the command.
///
@discardableResult
func run(
_ launchPath: String,
@ -14,11 +23,14 @@ func run(
env: [String: String]? = nil,
quiet: Bool = false,
task: Process = Process()
) -> Int32 {
globalTaskRef = task
) async -> Int32 {
await State.shared.register(task)
signal(SIGINT) { _ in
globalTaskRef?.terminate() // Send terminate signal to the task
exit(0) // Exit the script after cleanup
Task {
await State.shared.terminate()
exit(0)
}
}
task.launchPath = launchPath
@ -37,23 +49,48 @@ func run(
task.launch()
task.waitUntilExit()
return task.terminationStatus
}
///
/// Run a shell command.
///
/// - Parameters:
/// - launchPath: The command to run.
/// - args: Arguments to pass.
/// - env: Environment variables to pass for this specific command.
/// - quiet: Whether the standard and error output of the command should be printed or omitted.
///
/// - Returns: Exit code of the command.
///
func run(
_ launchPath: String,
_ args: String...,
env: [String: String]? = nil,
quiet: Bool = false
) -> Int32 {
return run(launchPath, args, env: env, quiet: quiet)
) async -> Int32 {
return await run(launchPath, args, env: env, quiet: quiet)
}
///
/// Run multiple shell commands.
///
/// - Returns: Exit code of the command.
///
@discardableResult
func shell(_ commands: String..., env: [String: String]? = nil, quiet: Bool = false) -> Int32 {
return run("/bin/zsh", ["-c"] + commands, env: env, quiet: quiet)
func shell(_ commands: String..., env: [String: String]? = nil, quiet: Bool = false) async -> Int32 {
return await run("/bin/zsh", ["-c"] + commands, env: env, quiet: quiet)
}
func commandExists(_ command: String) -> Bool {
return run("/usr/bin/type", command, quiet: true) == 0
///
/// Check whether the given shell command is available in the shell.
///
/// - Parameters:
/// - command: The command to check for availability.
///
/// - Returns: `true` in case of availability, otherwise `false`.
///
func commandExists(_ command: String) async -> Bool {
return await run("/usr/bin/type", command, quiet: true) == 0
}