aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/bin/activate.rs4
-rw-r--r--src/deploy.rs6
2 files changed, 5 insertions, 5 deletions
diff --git a/src/bin/activate.rs b/src/bin/activate.rs
index 73d064f..da53174 100644
--- a/src/bin/activate.rs
+++ b/src/bin/activate.rs
@@ -378,9 +378,9 @@ pub async fn activate(
debug!("Running activation script");
let activate_status = match Command::new(format!("{}/deploy-rs-activate", profile_path))
- .env("PROFILE", &closure)
+ .env("PROFILE", if dry_activate { &closure } else { &profile_path })
.env("DRY_ACTIVATE", if dry_activate { "1" } else { "0" })
- .current_dir(&closure)
+ .current_dir(if dry_activate { &closure } else { &profile_path })
.status()
.await
.map_err(ActivateError::RunActivateError)
diff --git a/src/deploy.rs b/src/deploy.rs
index f6cd4ef..285bbbd 100644
--- a/src/deploy.rs
+++ b/src/deploy.rs
@@ -237,8 +237,6 @@ pub async fn deploy_profile(
let auto_rollback = deploy_data.merged_settings.auto_rollback.unwrap_or(true);
- let dry_activate = dry_activate;
-
let self_activate_command = build_activate_command(ActivateCommandData {
sudo: &deploy_defs.sudo,
profile_path: &deploy_defs.profile_path,
@@ -280,7 +278,9 @@ pub async fn deploy_profile(
a => return Err(DeployProfileError::SSHActivateExitError(a)),
};
- if !dry_activate {
+ if dry_activate {
+ info!("Completed dry-activate!");
+ } else {
info!("Success activating, done!");
}
} else {