pesde-pkg/pesde
1
1
Fork 0
mirror of https://github.com/pesde-pkg/pesde.git synced 2024-12-12 11:00:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

feat: patch before linking

Browse source
This commit is contained in:
daimond113 2024-11-10 17:16:35 +01:00
parent a9b1fa655f
commit 15868acce0
No known key found for this signature in database
GPG key ID: 3A8ECE51328B513C
1 changed files with 58 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

106
src/cli/commands/install.rs
View file

@ -239,52 +239,6 @@ impl InstallCommand {
downloaded_graph.clone()
};
println!("{} 🗺️ linking dependencies", job(4));
project
.link_dependencies(&filtered_graph)
.await
.context("failed to link dependencies")?;
let bin_folder = bin_dir().await?;
for versions in filtered_graph.values() {
for node in versions.values() {
if node.target.bin_path().is_none() {
continue;
}
let Some((alias, _)) = &node.node.direct else {
continue;
};
if alias == env!("CARGO_BIN_NAME") {
log::warn!("package {alias} has the same name as the CLI, skipping bin link");
continue;
}
let bin_file = bin_folder.join(alias);
fs::write(&bin_file, bin_link_file(alias))
.await
.context("failed to write bin link file")?;
make_executable(&bin_file)
.await
.context("failed to make bin link executable")?;
#[cfg(windows)]
{
let bin_file = bin_file.with_extension(std::env::consts::EXE_EXTENSION);
fs::copy(
std::env::current_exe().context("failed to get current executable path")?,
&bin_file,
)
.await
.context("failed to copy bin link file")?;
}
}
}
#[cfg(feature = "patches")]
{
let rx = project
@ -296,12 +250,68 @@ impl InstallCommand {
manifest.patches.values().map(|v| v.len() as u64).sum(),
rx,
&multi,
format!("{} 🩹 applying patches", job(5)),
format!("{} 🩹 applied patches", job(5)),
format!("{} 🩹 applying patches", job(4)),
format!("{} 🩹 applied patches", job(4)),
)
.await?;
}
println!("{} 🗺️ linking dependencies", job(JOBS - 1));
let bin_folder = bin_dir().await?;
try_join_all(
filtered_graph
.values()
.flat_map(|versions| versions.values())
.filter(|node| node.target.bin_path().is_some())
.filter_map(|node| node.node.direct.as_ref())
.map(|(alias, _)| alias)
.filter(|alias| {
if *alias == env!("CARGO_BIN_NAME") {
log::warn!(
"package {alias} has the same name as the CLI, skipping bin link"
);
return false;
}
true
})
.map(|alias| {
let bin_folder = bin_folder.clone();
async move {
let bin_file = bin_folder.join(alias);
fs::write(&bin_file, bin_link_file(alias))
.await
.context("failed to write bin link file")?;
make_executable(&bin_file)
.await
.context("failed to make bin link executable")?;
#[cfg(windows)]
{
let bin_file = bin_file.with_extension(std::env::consts::EXE_EXTENSION);
fs::copy(
std::env::current_exe()
.context("failed to get current executable path")?,
&bin_file,
)
.await
.context("failed to copy bin link file")?;
}
Ok::<_, anyhow::Error>(())
}
}),
)
.await?;
project
.link_dependencies(&filtered_graph)
.await
.context("failed to link dependencies")?;
println!("{} 🧹 finishing up", job(JOBS));
project