From c8a40bedcdd218d981a1cbc67f232a84535af0ed Mon Sep 17 00:00:00 2001 From: notgne2 Date: Sun, 28 Feb 2021 02:38:06 -0700 Subject: Re-use `ssh_addr` --- src/deploy.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/deploy.rs b/src/deploy.rs index fb6ce0a..f560172 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); @@ -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?; } -- cgit v1.2.3 From 0e1cc238e1fc7181185aaebe31da925bb6aefca8 Mon Sep 17 00:00:00 2001 From: notgne2 Date: Sun, 28 Feb 2021 02:38:40 -0700 Subject: Remove `ssh://` prefix from SSH addresses --- src/deploy.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/deploy.rs b/src/deploy.rs index f560172..f6871d2 100644 --- a/src/deploy.rs +++ b/src/deploy.rs @@ -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); -- cgit v1.2.3