lix-project/lix-installer
16
4
Fork 4
Code Issues 23 Code Review (Gerrit) Projects Activity

Remove some bad merge code (#252)

Browse source
This commit is contained in:
Ana Hobden 2023-02-15 13:20:58 -08:00 committed by GitHub
parent 9f34c49461
commit c150d603ea
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 0 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
src/cli/subcommand/uninstall.rs
View file

@ -94,33 +94,6 @@ impl CommandExecute for Uninstall {
} }
} }
// During install, `nix-installer` will store a copy of itself in `/nix/nix-installer`
// If the user opted to run that particular copy of `nix-installer` to do this uninstall,
// well, we have a problem, since the binary would delete itself.
// Instead, detect if we're in that location, if so, move the binary and `execv` it.
if let Ok(current_exe) = std::env::current_exe() {
if current_exe.as_path() == Path::new("/nix/nix-installer") {
tracing::debug!(
"Detected uninstall from `/nix/nix-installer`, moving executable and re-executing"
);
let temp = std::env::temp_dir();
let temp_exe = temp.join("nix-installer");
tokio::fs::copy(&current_exe, &temp_exe)
.await
.wrap_err("Copying `nix-installer` to tempdir")?;
let args = std::env::args();
let mut arg_vec_cstring = vec![];
for arg in args {
arg_vec_cstring.push(CString::new(arg).wrap_err("Making arg into C string")?);
}
let temp_exe_cstring = CString::new(temp_exe.to_string_lossy().into_owned())
.wrap_err("Making C string of executable path")?;
nix::unistd::execv(&temp_exe_cstring, &arg_vec_cstring)
.wrap_err("Executing copied `nix-installer`")?;
}
}
let install_receipt_string = tokio::fs::read_to_string(receipt) let install_receipt_string = tokio::fs::read_to_string(receipt)
.await .await
.wrap_err("Reading receipt")?; .wrap_err("Reading receipt")?;