Merge branch 'main' into foreground-process-fix

swiftlang · Feb 11, 2025 · c765ea6 · c765ea6
2 parents 9826fc2 + 7517530
commit c765ea6
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
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")
                 }
             }