Skip to content

Commit

Permalink
Fix symlinks better
Browse files Browse the repository at this point in the history
  • Loading branch information
Jake-Shadle committed Aug 21, 2024
1 parent da47b0a commit 989d9d6
Showing 1 changed file with 7 additions and 5 deletions.
12 changes: 7 additions & 5 deletions src/ctx.rs
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ impl Ctx {
let crt_ft = parking_lot::Mutex::new(None);
let atl_ft = parking_lot::Mutex::new(None);

let splat_config = match &ops {
let mut splat_config = match &ops {
crate::Ops::Splat(config) => {
let splat_roots = crate::splat::prep_splat(
self.clone(),
Expand Down Expand Up @@ -217,10 +217,11 @@ impl Ctx {

// Detect if the output root directory is case sensitive or not,
// if it's not, disable symlinks as they won't work
let enable_symlinks = if let Some(root) = splat_config
.as_ref()
.and_then(|(sr, c)| c.enable_symlinks.then_some(&sr.root))
{
let enable_symlinks = if let Some((root, sc_enable_symlinks)) =
splat_config.as_mut().and_then(|(sr, c)| {
c.enable_symlinks
.then_some((&sr.root, &mut c.enable_symlinks))
}) {
let test_path = root.join("BIG.xwin");
std::fs::write(&test_path, "").with_context(|| {
format!("failed to write case-sensitivity test file {test_path}")
Expand All @@ -235,6 +236,7 @@ impl Ctx {

// Will be ugly but won't harm anything if file is left
let _ = std::fs::remove_file(test_path);
*sc_enable_symlinks = enable_symlinks;
enable_symlinks
} else {
false
Expand Down

0 comments on commit 989d9d6

Please sign in to comment.