Remove phase 1 and 2 uninstall receipts if they exist upon a successf…

…ul install
DeterminateSystems · Nov 8, 2024 · 95c9038 · 95c9038
1 parent 6644b58
commit 95c9038
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 3 deletions.
diff --git a/src/cli/subcommand/install.rs b/src/cli/subcommand/install.rs
@@ -9,7 +9,9 @@ use crate::{
     cli::{
         ensure_root,
         interaction::{self, PromptChoice},
-        signal_channel, CommandExecute,
+        signal_channel,
+        subcommand::split_receipt::{PHASE1_RECEIPT_LOCATION, PHASE2_RECEIPT_LOCATION},
+        CommandExecute,
     },
     error::HasExpectedErrors,
     plan::RECEIPT_LOCATION,
@@ -319,6 +321,20 @@ impl CommandExecute for Install {
                 copy_self_to_nix_dir()
                     .await
                     .wrap_err("Copying `nix-installer` to `/nix/nix-installer`")?;
+
+                if Path::new(PHASE1_RECEIPT_LOCATION).exists() {
+                    tracing::debug!("Removing pre-existing uninstall phase 1 receipt at {PHASE1_RECEIPT_LOCATION} after successful install");
+                    tokio::fs::remove_file(PHASE1_RECEIPT_LOCATION)
+                        .await
+                        .wrap_err_with(|| format!("Failed to remove uninstall phase 1 receipt at {PHASE1_RECEIPT_LOCATION}"))?;
+                }
+                if Path::new(PHASE2_RECEIPT_LOCATION).exists() {
+                    tracing::debug!("Removing pre-existing uninstall phase 2 receipt at {PHASE2_RECEIPT_LOCATION} after successful install");
+                    tokio::fs::remove_file(PHASE2_RECEIPT_LOCATION)
+                        .await
+                        .wrap_err_with(|| format!("Failed to remove uninstall phase 2 receipt at {PHASE2_RECEIPT_LOCATION}"))?;
+                }
+
                 println!(
                     "\
                     {success}\n\

diff --git a/src/cli/subcommand/mod.rs b/src/cli/subcommand/mod.rs
@@ -19,8 +19,8 @@ mod split_receipt {
 
     use crate::cli::CommandExecute;
 
-    const PHASE1_RECEIPT_LOCATION: &str = "/nix/uninstall-phase1.json";
-    const PHASE2_RECEIPT_LOCATION: &str = "/nix/uninstall-phase2.json";
+    pub(crate) const PHASE1_RECEIPT_LOCATION: &str = "/nix/uninstall-phase1.json";
+    pub(crate) const PHASE2_RECEIPT_LOCATION: &str = "/nix/uninstall-phase2.json";
 
     /// Split an existing receipt into two phases, one that cleans up the Nix store (phase 2), and
     /// one that does everything else (phase 1).