Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Install to tmpdir then atomic move #1116

Merged
merged 1 commit into from
Feb 8, 2025
Merged

Install to tmpdir then atomic move #1116

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 38 additions & 7 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions crates/lib/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ futures = "0.3.31"
lazy_static = "1.5.0"
nix = { version = "0.29.0", features = ["process"] }
fs2 = "0.4.3"
tempfile = "3.16.0"

[target.'cfg(not(target_os = "macos"))'.dependencies]
rusqlite = { version = "0.32.1", features = ["bundled"] }
16 changes: 12 additions & 4 deletions crates/lib/src/install.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ use async_compression::tokio::bufread::XzDecoder;
use fs2::FileExt;
use reqwest::Client;
use std::{error::Error, fs::OpenOptions, path::PathBuf};
use tempfile::tempdir_in;
use tokio::task;
use tokio_tar::Archive;

Expand Down Expand Up @@ -53,9 +54,9 @@ where

let dst_path = cellar::dst(pkg, config);

// did another instance of pkx install us while we waited for the lock?
// did another instance of pkgx install us while we waited for the lock?
// if so, we’re good: eject
if fs::exists(dst_path.clone())? {
if dst_path.is_dir() {
FileExt::unlock(&shelf)?;
return Ok(Installation {
path: dst_path,
Expand Down Expand Up @@ -93,9 +94,16 @@ where
// Step 2: Create a XZ decoder
let decoder = XzDecoder::new(stream);

// Step 3: Extract the tar archive
// Step 3: Make a temporary directory to extract the tarball into
let temp_dir = tempdir_in(config.pkgx_dir.join(&pkg.project))?;

// Step 4: Extract the tar archive
let mut archive = Archive::new(decoder);
archive.unpack(&config.pkgx_dir).await?;
archive.unpack(&temp_dir).await?;

// Step 5: atomically move from temp dir to installation location
let partial_path = format!("{}/v{}", pkg.project, pkg.version.raw);
fs::rename(temp_dir.into_path().join(&partial_path), &dst_path)?;

let installation = Installation {
path: dst_path,
Expand Down