From a9d2154110e212bfc4ed26008a948b9209212b6d Mon Sep 17 00:00:00 2001
From: Lino Le Van <11367844+lino-levan@users.noreply.github.com>
Date: Thu, 8 Dec 2022 14:48:48 -0800
Subject: [PATCH] fix(cli/upgrade): properly cleanup after finished (#16930)

Co-authored-by: kidonng <kidonng@users.noreply.github.com>
---
 cli/tools/upgrade.rs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/cli/tools/upgrade.rs b/cli/tools/upgrade.rs
index 8c987e82cb..cb155d716f 100644
--- a/cli/tools/upgrade.rs
+++ b/cli/tools/upgrade.rs
@@ -377,6 +377,8 @@ pub async fn upgrade(upgrade_flags: UpgradeFlags) -> Result<(), AnyError> {
         return Err(err.into());
       }
     }
+  } else {
+    fs::remove_file(&new_exe_path)?;
   }
 
   log::info!("Upgraded successfully");
@@ -520,7 +522,7 @@ pub fn unpack(
       fs::write(&archive_path, &archive_data)?;
       Command::new("unzip")
         .current_dir(&temp_dir)
-        .arg(archive_path)
+        .arg(&archive_path)
         .spawn()
         .map_err(|err| {
           if err.kind() == std::io::ErrorKind::NotFound {
@@ -538,6 +540,7 @@ pub fn unpack(
   };
   assert!(unpack_status.success());
   assert!(exe_path.exists());
+  fs::remove_file(&archive_path)?;
   Ok(exe_path)
 }