From aa474d5a90b1ab076dbe718c3d4e9854d4336204 Mon Sep 17 00:00:00 2001 From: Josh Soref <2119212+jsoref@users.noreply.github.com> Date: Sun, 15 Jun 2025 07:03:59 -0400 Subject: [PATCH 1/7] spelling: , let's Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com> --- Sources/CLI/Container/ContainerDelete.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Sources/CLI/Container/ContainerDelete.swift b/Sources/CLI/Container/ContainerDelete.swift index 0da56377..32442da5 100644 --- a/Sources/CLI/Container/ContainerDelete.swift +++ b/Sources/CLI/Container/ContainerDelete.swift @@ -61,7 +61,7 @@ extension Application { containers = ctrs.filter { c in set.contains(c.id) } - // If one of the containers requested isn't present lets throw. We don't need to do + // If one of the containers requested isn't present, let's throw. We don't need to do // this for --all as --all should be perfectly usable with no containers to remove, otherwise // it'd be quite clunky. if containers.count != set.count { From 4dbf231e45b7168b324a77a9984265e33a5cbb86 Mon Sep 17 00:00:00 2001 From: Josh Soref <2119212+jsoref@users.noreply.github.com> Date: Fri, 13 Jun 2025 07:51:19 -0400 Subject: [PATCH 2/7] spelling: ; otherwise, Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com> --- Sources/CLI/Container/ContainerDelete.swift | 2 +- Sources/ContainerPlugin/PluginLoader.swift | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Sources/CLI/Container/ContainerDelete.swift b/Sources/CLI/Container/ContainerDelete.swift index 32442da5..eb7baf28 100644 --- a/Sources/CLI/Container/ContainerDelete.swift +++ b/Sources/CLI/Container/ContainerDelete.swift @@ -62,7 +62,7 @@ extension Application { set.contains(c.id) } // If one of the containers requested isn't present, let's throw. We don't need to do - // this for --all as --all should be perfectly usable with no containers to remove, otherwise + // this for --all as --all should be perfectly usable with no containers to remove; otherwise, // it'd be quite clunky. if containers.count != set.count { let missing = set.filter { id in diff --git a/Sources/ContainerPlugin/PluginLoader.swift b/Sources/ContainerPlugin/PluginLoader.swift index 6a8b97b0..db86036a 100644 --- a/Sources/ContainerPlugin/PluginLoader.swift +++ b/Sources/ContainerPlugin/PluginLoader.swift @@ -169,7 +169,7 @@ extension PluginLoader { instanceId: String? = nil ) throws { // We only care about loading plugins that have a service - // to expose, otherwise they may just be CLI commands. + // to expose; otherwise, they may just be CLI commands. guard let serviceConfig = plugin.config.servicesConfig else { return } @@ -201,7 +201,7 @@ extension PluginLoader { public func deregisterWithLaunchd(plugin: Plugin, instanceId: String? = nil) throws { // We only care about loading plugins that have a service - // to expose, otherwise they may just be CLI commands. + // to expose; otherwise, they may just be CLI commands. guard plugin.config.servicesConfig != nil else { return } From 2cb76db6e420c88b4e2552e8048302ce0caba609 Mon Sep 17 00:00:00 2001 From: Josh Soref <2119212+jsoref@users.noreply.github.com> Date: Fri, 13 Jun 2025 09:51:12 -0400 Subject: [PATCH 3/7] spelling: harness Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com> --- Sources/APIServer/APIServer.swift | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Sources/APIServer/APIServer.swift b/Sources/APIServer/APIServer.swift index c771c946..3edb85a9 100644 --- a/Sources/APIServer/APIServer.swift +++ b/Sources/APIServer/APIServer.swift @@ -182,9 +182,9 @@ struct APIServer: AsyncParsableCommand { private func initializeKernelService(log: Logger, routes: inout [XPCRoute: XPCServer.RouteHandler]) throws { let svc = try KernelService(log: log, appRoot: Self.appRoot) - let harnsess = KernelHarness(service: svc, log: log) - routes[XPCRoute.installKernel] = harnsess.install - routes[XPCRoute.getDefaultKernel] = harnsess.getDefaultKernel + let harness = KernelHarness(service: svc, log: log) + routes[XPCRoute.installKernel] = harness.install + routes[XPCRoute.getDefaultKernel] = harness.getDefaultKernel } private func initializeContainerService(root: URL, pluginLoader: PluginLoader, log: Logger, routes: inout [XPCRoute: XPCServer.RouteHandler]) throws { From 9f7a864a346991ecaa72ea3b05efeea6029429fa Mon Sep 17 00:00:00 2001 From: Josh Soref <2119212+jsoref@users.noreply.github.com> Date: Fri, 13 Jun 2025 07:52:31 -0400 Subject: [PATCH 4/7] spelling: macos Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com> --- Makefile | 2 +- Sources/CLI/Application.swift | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 500c1f8c..2a421457 100644 --- a/Makefile +++ b/Makefile @@ -49,7 +49,7 @@ all: init-block .PHONY: build build: @echo Building container binaries... - @#Remove this when the updated MacOS SDK is available publicly + @#Remove this when the updated macOS SDK is available publicly $(SWIFT) build -c $(BUILD_CONFIGURATION) $(CURRENT_SDK_ARGS) ; \ .PHONY: container diff --git a/Sources/CLI/Application.swift b/Sources/CLI/Application.swift index 3631de5a..a153acd2 100644 --- a/Sources/CLI/Application.swift +++ b/Sources/CLI/Application.swift @@ -294,7 +294,7 @@ extension Application { versionDetails["build"] = "debug" #endif #if CURRENT_SDK - versionDetails["sdk"] = "MacOS 15" + versionDetails["sdk"] = "macOS 15" #endif let gitCommit = { let sha = get_git_commit().map { String(cString: $0) } From bef7da586ceec1febd306389ed0db25b0e2ba56d Mon Sep 17 00:00:00 2001 From: Josh Soref <2119212+jsoref@users.noreply.github.com> Date: Fri, 13 Jun 2025 07:52:48 -0400 Subject: [PATCH 5/7] spelling: than Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com> --- Sources/TerminalProgress/ProgressBar+Add.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Sources/TerminalProgress/ProgressBar+Add.swift b/Sources/TerminalProgress/ProgressBar+Add.swift index 7f5a68f9..8fef8baa 100644 --- a/Sources/TerminalProgress/ProgressBar+Add.swift +++ b/Sources/TerminalProgress/ProgressBar+Add.swift @@ -64,7 +64,7 @@ extension ProgressBar { var finished = true var defined = false if let totalTasks = state.totalTasks, totalTasks > 0 { - // For tasks, we're showing the current task rather then the number of completed tasks. + // For tasks, we're showing the current task rather than the number of completed tasks. finished = finished && state.tasks == totalTasks defined = true } From 084029afc8eb170db2d3e3fb4ab575d5d4ef0ae9 Mon Sep 17 00:00:00 2001 From: Josh Soref <2119212+jsoref@users.noreply.github.com> Date: Fri, 13 Jun 2025 07:50:54 -0400 Subject: [PATCH 6/7] spelling: the Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com> --- Sources/ContainerClient/Core/ClientImage.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Sources/ContainerClient/Core/ClientImage.swift b/Sources/ContainerClient/Core/ClientImage.swift index 684f302c..386bc118 100644 --- a/Sources/ContainerClient/Core/ClientImage.swift +++ b/Sources/ContainerClient/Core/ClientImage.swift @@ -99,7 +99,7 @@ extension ClientImage { public static func normalizeReference(_ ref: String) throws -> String { guard ref != Self.initImageRef else { - // Don't modify the the default init image reference. + // Don't modify the default init image reference. // This is to allow for easier local development against // an updated containerization. return ref From d11cf2574ed0a25a20b0c6ff8f3f3d1b03366ead Mon Sep 17 00:00:00 2001 From: Josh Soref <2119212+jsoref@users.noreply.github.com> Date: Fri, 13 Jun 2025 07:51:00 -0400 Subject: [PATCH 7/7] spelling: when Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com> --- Sources/TerminalProgress/ProgressConfig.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Sources/TerminalProgress/ProgressConfig.swift b/Sources/TerminalProgress/ProgressConfig.swift index 88b4b749..353cc339 100644 --- a/Sources/TerminalProgress/ProgressConfig.swift +++ b/Sources/TerminalProgress/ProgressConfig.swift @@ -27,7 +27,7 @@ public struct ProgressConfig: Sendable { /// The initial items name (e.g., "files"). let initialItemsName: String /// A flag indicating whether to show a spinner (e.g., "⠋"). - /// The spinner is hidden when when a progress bar is shown. + /// The spinner is hidden when a progress bar is shown. public let showSpinner: Bool /// A flag indicating whether to show tasks and total tasks (e.g., "[1]" or "[1/3]"). public let showTasks: Bool