diff --git a/Sources/Swiftly/Run.swift b/Sources/Swiftly/Run.swift index a3126b4e..21c1bb2c 100644 --- a/Sources/Swiftly/Run.swift +++ b/Sources/Swiftly/Run.swift @@ -58,10 +58,8 @@ struct Run: SwiftlyCommand { } mutating func run(_ ctx: SwiftlyCoreContext) async throws { - let versionUpdateReminder = try await validateSwiftly(ctx) - defer { - versionUpdateReminder() - } + try await validateSwiftly(ctx) + var config = try await Config.load(ctx) // Handle the specific case where help is requested of the run subcommand diff --git a/Sources/Swiftly/SelfUpdate.swift b/Sources/Swiftly/SelfUpdate.swift index eb26b14e..fb3d93bc 100644 --- a/Sources/Swiftly/SelfUpdate.swift +++ b/Sources/Swiftly/SelfUpdate.swift @@ -29,7 +29,7 @@ struct SelfUpdate: SwiftlyCommand { } mutating func run(_ ctx: SwiftlyCoreContext) async throws { - let _ = try await validateSwiftly(ctx) + try await validateSwiftly(ctx) let swiftlyBin = Swiftly.currentPlatform.swiftlyBinDir(ctx) / "swiftly" guard try await fs.exists(atPath: swiftlyBin) else { diff --git a/Sources/Swiftly/Swiftly.swift b/Sources/Swiftly/Swiftly.swift index 6660b9ab..31f6d59a 100644 --- a/Sources/Swiftly/Swiftly.swift +++ b/Sources/Swiftly/Swiftly.swift @@ -95,6 +95,7 @@ extension Data { } extension SwiftlyCommand { + @discardableResult public mutating func validateSwiftly(_ ctx: SwiftlyCoreContext) async throws -> () -> Void { for requiredDir in Swiftly.requiredDirectories(ctx) { guard try await fs.exists(atPath: requiredDir) else {