diff options
author | notgne2 | 2021-03-01 20:12:55 -0700 |
---|---|---|
committer | GitHub | 2021-03-01 20:12:55 -0700 |
commit | 6278b9bef5ad624676a565980417cbbef42d5227 (patch) | |
tree | 221b5a6ea098a3788163a653401d013ef19f55a3 | |
parent | 4d4bdda3abd243e892d45c2ee7844414570b1823 (diff) | |
parent | 0e1cc238e1fc7181185aaebe31da925bb6aefca8 (diff) |
Merge pull request #64 from serokell/notgne2/fix-ssh-url
Remove `ssh://` prefix from SSH addresses
-rw-r--r-- | src/deploy.rs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/deploy.rs b/src/deploy.rs index fb6ce0a..f6871d2 100644 --- a/src/deploy.rs +++ b/src/deploy.rs @@ -150,11 +150,11 @@ pub enum ConfirmProfileError { pub async fn confirm_profile( deploy_data: &super::DeployData<'_>, deploy_defs: &super::DeployDefs, - hostname: &str, temp_path: Cow<'_, str>, + ssh_addr: &str, ) -> Result<(), ConfirmProfileError> { let mut ssh_confirm_command = Command::new("ssh"); - ssh_confirm_command.arg(format!("ssh://{}@{}", deploy_defs.ssh_user, hostname)); + ssh_confirm_command.arg(ssh_addr); for ssh_opt in &deploy_data.merged_settings.ssh_opts { ssh_confirm_command.arg(ssh_opt); @@ -246,7 +246,7 @@ pub async fn deploy_profile( None => &deploy_data.node.node_settings.hostname, }; - let ssh_addr = format!("ssh://{}@{}", deploy_defs.ssh_user, hostname); + let ssh_addr = format!("{}@{}", deploy_defs.ssh_user, hostname); let mut ssh_activate_command = Command::new("ssh"); ssh_activate_command.arg(&ssh_addr); @@ -330,7 +330,7 @@ pub async fn deploy_profile( info!("Success activating, attempting to confirm activation"); - let c = confirm_profile(deploy_data, deploy_defs, hostname, temp_path).await; + let c = confirm_profile(deploy_data, deploy_defs, temp_path, &ssh_addr).await; recv_activated.await.unwrap(); c?; } |