From 64d399e897695b491d38acc85845ec4864d4669f Mon Sep 17 00:00:00 2001 From: Boni Garcia Date: Mon, 25 Mar 2024 22:50:00 +0100 Subject: [PATCH] [rust] Enhance logic to move Edge from temporal folder to cache --- rust/src/files.rs | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/rust/src/files.rs b/rust/src/files.rs index fc1e3be7e57d1..683e5494bff55 100644 --- a/rust/src/files.rs +++ b/rust/src/files.rs @@ -280,17 +280,18 @@ pub fn uncompress_deb( let zip_parent_str = path_to_string(zip_parent); let target_str = path_to_string(target); - let opt_edge_str = format!( - "mv {}/opt/microsoft/{} {}", - zip_parent_str, label, target_str - ); - let command = Command::new_single(opt_edge_str.clone()); + let opt_edge_str = format!("{}/opt/microsoft/{}", zip_parent_str, label); + let opt_edge_mv = format!("mv {} {}", opt_edge_str, target_str); + let command = Command::new_single(opt_edge_mv.clone()); log.trace(format!( "Moving extracted files and folders from {} to {}", opt_edge_str, target_str )); create_parent_path_if_not_exists(target)?; - run_shell_command_by_os(os, command)?; + let output = run_shell_command_by_os(os, command)?; + if output.is_empty() { + fs::rename(&opt_edge_str, &target_str)?; + } Ok(()) }