aboutsummaryrefslogtreecommitdiffhomepage
path: root/crates/shirabe/src/installer/library_installer.rs
diff options
context:
space:
mode:
Diffstat (limited to 'crates/shirabe/src/installer/library_installer.rs')
-rw-r--r--crates/shirabe/src/installer/library_installer.rs26
1 files changed, 14 insertions, 12 deletions
diff --git a/crates/shirabe/src/installer/library_installer.rs b/crates/shirabe/src/installer/library_installer.rs
index d2f222e..d716814 100644
--- a/crates/shirabe/src/installer/library_installer.rs
+++ b/crates/shirabe/src/installer/library_installer.rs
@@ -63,21 +63,23 @@ impl LibraryInstaller {
Some("/"),
);
let binary_installer = binary_installer.unwrap_or_else(|| {
- BinaryInstaller::new(
- io.clone(),
- rtrim(
- &composer_ref
- .get_config()
- .borrow_mut()
- .get_str("bin-dir")
- .unwrap_or_default(),
- Some("/"),
- ),
- composer_ref
+ let bin_dir = rtrim(
+ &composer_ref
.get_config()
.borrow_mut()
- .get_str("bin-compat")
+ .get_str("bin-dir")
.unwrap_or_default(),
+ Some("/"),
+ );
+ let bin_compat = composer_ref
+ .get_config()
+ .borrow_mut()
+ .get_str("bin-compat")
+ .unwrap_or_default();
+ BinaryInstaller::new(
+ io.clone(),
+ bin_dir,
+ bin_compat,
Some(filesystem.clone()),
Some(vendor_dir.clone()),
)