Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions Sources/APIServer/APIServer.swift
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion Sources/CLI/Application.swift
Original file line number Diff line number Diff line change
Expand Up @@ -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) }
Expand Down
4 changes: 2 additions & 2 deletions Sources/CLI/Container/ContainerDelete.swift
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,8 @@ 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
// this for --all as --all should be perfectly usable with no containers to remove, otherwise
// 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 {
let missing = set.filter { id in
Expand Down
2 changes: 1 addition & 1 deletion Sources/ContainerClient/Core/ClientImage.swift
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions Sources/ContainerPlugin/PluginLoader.swift
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down Expand Up @@ -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
}
Expand Down
2 changes: 1 addition & 1 deletion Sources/TerminalProgress/ProgressBar+Add.swift
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down
2 changes: 1 addition & 1 deletion Sources/TerminalProgress/ProgressConfig.swift
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down