From d7f0006df0e3c14a9387f5bd3e3e3acd0b39fda8 Mon Sep 17 00:00:00 2001 From: notgne2 Date: Thu, 29 Oct 2020 12:35:07 -0700 Subject: Make lock hash clearer (at apparently no expense) --- src/activate.rs | 2 +- src/utils/deploy.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/activate.rs b/src/activate.rs index 8c1cfe4..3ad7e60 100644 --- a/src/activate.rs +++ b/src/activate.rs @@ -152,7 +152,7 @@ pub async fn activation_confirmation( confirm_timeout: u16, closure: String, ) -> Result<(), Box> { - let lock_hash = &closure[11 /* /nix/store/ */ ..]; + let lock_hash = &closure["/nix/store/".len()..]; let lock_path = format!("{}/activating-{}", temp_path, lock_hash); if let Some(parent) = Path::new(&lock_path).parent() { diff --git a/src/utils/deploy.rs b/src/utils/deploy.rs index 59217df..8ed7d8c 100644 --- a/src/utils/deploy.rs +++ b/src/utils/deploy.rs @@ -140,7 +140,7 @@ pub async fn deploy_profile( ssh_confirm_command = ssh_confirm_command.arg(ssh_opt); } - let lock_hash = &deploy_data.profile.profile_settings.path[11 /* /nix/store/ */ ..]; + let lock_hash = &deploy_data.profile.profile_settings.path["/nix/store/".len()..]; let lock_path = format!("{}/activating-{}", temp_path, lock_hash); let mut confirm_command = format!("rm {}", lock_path); -- cgit v1.2.3