diff options
| author | Andreas Fuchs | 2020-11-25 19:08:00 -0500 |
|---|---|---|
| committer | notgne2 | 2020-12-02 10:24:23 -0700 |
| commit | 29ab0624e3ff236669627f7154071e6c555abd85 (patch) | |
| tree | c336a6af1c98ad2b8e7bb77dc72c6a12eaa7944c /src/utils/push.rs | |
| parent | 6ccc0b7ae981d8cd872af1eae69a2435aa87b8ef (diff) | |
Use the profile closure's activate script to activate the profile
This gets rid of the "current_exe" vestige that has stuck around from
when this program was meant to be standalone; instead, we use
the (already known) path to the activate-rs wrapper, which
automatically uses the correct binary for the deploy target platform.
Diffstat (limited to '')
| -rw-r--r-- | src/utils/push.rs | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/utils/push.rs b/src/utils/push.rs index 342cd65..2dd408b 100644 --- a/src/utils/push.rs +++ b/src/utils/push.rs @@ -99,9 +99,7 @@ pub async fn push_profile( .arg("-k") .arg(local_key) .arg(&deploy_data.profile.profile_settings.path) - .arg(&super::deploy_path_to_activate_path_str( - &deploy_defs.current_exe, - )?) + .arg(&super::deploy_path_to_activate_path_str(&deploy_defs)?) .status() .await .map_err(PushProfileError::SignError)?; @@ -146,9 +144,7 @@ pub async fn push_profile( .arg("--to") .arg(format!("ssh://{}@{}", deploy_defs.ssh_user, hostname)) .arg(&deploy_data.profile.profile_settings.path) - .arg(&super::deploy_path_to_activate_path_str( - &deploy_defs.current_exe, - )?) + .arg(&super::deploy_path_to_activate_path_str(&deploy_defs)?) .env("NIX_SSHOPTS", ssh_opts_str) .status() .await |