Merge branch 'main' into foreground-process-fix

johnbute · web-flow · commit c765ea69f916 · 2025-02-11T13:26:12.000-05:00
diff --git a/Sources/Swiftly/Init.swift b/Sources/Swiftly/Init.swift
@@ -77,7 +77,7 @@ internal struct Init: SwiftlyCommand {
             \(installMsg)
             """)
 
-            guard promptForConfirmation(defaultBehavior: true) else {
+            guard SwiftlyCore.promptForConfirmation(defaultBehavior: true) else {
                 throw SwiftlyError(message: "Swiftly installation has been cancelled")
             }
         }
@@ -93,7 +93,7 @@ internal struct Init: SwiftlyCommand {
                 SwiftlyCore.print("  \(swiftlyBinDir.appendingPathComponent(executable).path)")
             }
 
-            guard promptForConfirmation(defaultBehavior: false) else {
+            guard SwiftlyCore.promptForConfirmation(defaultBehavior: false) else {
                 throw SwiftlyError(message: "Swiftly installation has been cancelled")
             }
         }
@@ -201,8 +201,12 @@ internal struct Init: SwiftlyCommand {
                     try FileManager.default.createDirectory(at: confDir, withIntermediateDirectories: true)
                     profileHome = confDir.appendingPathComponent("swiftly.fish", isDirectory: false)
                 } else {
-                    let confDir = userHome.appendingPathComponent(".config/fish/conf.d", isDirectory: true)
-                    try FileManager.default.createDirectory(at: confDir, withIntermediateDirectories: true)
+                    let confDir = userHome.appendingPathComponent(
+                        ".config/fish/conf.d", isDirectory: true
+                    )
+                    try FileManager.default.createDirectory(
+                        at: confDir, withIntermediateDirectories: true
+                    )
                     profileHome = confDir.appendingPathComponent("swiftly.fish", isDirectory: false)
                 }
             } else {
diff --git a/Sources/Swiftly/Install.swift b/Sources/Swiftly/Install.swift
@@ -266,7 +266,8 @@ struct Install: SwiftlyCommand {
                     SwiftlyCore.print("  \(swiftlyBinDir.appendingPathComponent(executable).path)")
                 }
 
-                guard promptForConfirmation(defaultBehavior: false) else {
+
+                guard SwiftlyCore.promptForConfirmation(defaultBehavior: false) else {
                     throw SwiftlyError(message: "Toolchain installation has been cancelled")
                 }
             }

Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,7 @@ internal struct Init: SwiftlyCommand {`
`77`	`77`	`\(installMsg)`
`78`	`78`	`""")`
`79`	`79`
`80`		`- guard promptForConfirmation(defaultBehavior: true) else {`
	`80`	`+ guard SwiftlyCore.promptForConfirmation(defaultBehavior: true) else {`
`81`	`81`	`throw SwiftlyError(message: "Swiftly installation has been cancelled")`
`82`	`82`	`}`
`83`	`83`	`}`
`@@ -93,7 +93,7 @@ internal struct Init: SwiftlyCommand {`
`93`	`93`	`SwiftlyCore.print(" \(swiftlyBinDir.appendingPathComponent(executable).path)")`
`94`	`94`	`}`
`95`	`95`
`96`		`- guard promptForConfirmation(defaultBehavior: false) else {`
	`96`	`+ guard SwiftlyCore.promptForConfirmation(defaultBehavior: false) else {`
`97`	`97`	`throw SwiftlyError(message: "Swiftly installation has been cancelled")`
`98`	`98`	`}`
`99`	`99`	`}`
`@@ -201,8 +201,12 @@ internal struct Init: SwiftlyCommand {`
`201`	`201`	`try FileManager.default.createDirectory(at: confDir, withIntermediateDirectories: true)`
`202`	`202`	`profileHome = confDir.appendingPathComponent("swiftly.fish", isDirectory: false)`
`203`	`203`	`} else {`
`204`		`- let confDir = userHome.appendingPathComponent(".config/fish/conf.d", isDirectory: true)`
`205`		`- try FileManager.default.createDirectory(at: confDir, withIntermediateDirectories: true)`
	`204`	`+ let confDir = userHome.appendingPathComponent(`
	`205`	`+ ".config/fish/conf.d", isDirectory: true`
	`206`	`+ )`
	`207`	`+ try FileManager.default.createDirectory(`
	`208`	`+ at: confDir, withIntermediateDirectories: true`
	`209`	`+ )`
`206`	`210`	`profileHome = confDir.appendingPathComponent("swiftly.fish", isDirectory: false)`
`207`	`211`	`}`
`208`	`212`	`} else {`
Original file line number	Diff line number	Diff line change
`@@ -266,7 +266,8 @@ struct Install: SwiftlyCommand {`
`266`	`266`	`SwiftlyCore.print(" \(swiftlyBinDir.appendingPathComponent(executable).path)")`
`267`	`267`	`}`
`268`	`268`
`269`		`- guard promptForConfirmation(defaultBehavior: false) else {`
	`269`	`+`
	`270`	`+ guard SwiftlyCore.promptForConfirmation(defaultBehavior: false) else {`
`270`	`271`	`throw SwiftlyError(message: "Toolchain installation has been cancelled")`
`271`	`272`	`}`
`272`	`273`	`}`