Attempt to wait on sshpass to get logged in.

Kaiede · Jan 6, 2024 · 9ff5a59 · 9ff5a59
1 parent 92dba31
commit 9ff5a59
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/Sources/Bedrockifier/Model/ContainerConfig.swift b/Sources/Bedrockifier/Model/ContainerConfig.swift
@@ -153,6 +153,7 @@ public struct SSHConnectionConfig: ContainerConnectionConfig {
         return [
             // sshpass arguments
             "-e",
+            "-v",
             // ssh arguments
             sshPath,
             "-p",

diff --git a/Sources/Bedrockifier/Model/ContainerConnection.swift b/Sources/Bedrockifier/Model/ContainerConnection.swift
@@ -102,6 +102,14 @@ public class ContainerConnection {
         terminalProcess.environment = environment
 
         try terminalProcess.run()
+
+        if connectionConfig.kind == "ssh" {
+            let result = await terminal.expect(["SSHPASS: detected prompt. Sending password.", "SSHPASS: read:"], timeout: 60.0)
+            if result == .noMatch {
+                Library.log.error("SSH connection doesn't seem to have been made properly")
+            }
+        }
+
         logTerminalSize()
     }