Fix symlinks better (#137)

* Fix symlinks better

* Update CHANGELOG

CHANGELOG.md

@@ -8,6 +8,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 <!-- next-header -->
 ## [Unreleased] - ReleaseDate
+### Fixed
+- [PR#137](https://github.com/Jake-Shadle/xwin/pull/137) fixes the fix introduced in [PR#136](https://github.com/Jake-Shadle/xwin/pull/136).
+
 ## [0.6.4] - 2024-08-21
 ### Fixed
 - [PR#136](https://github.com/Jake-Shadle/xwin/pull/136) fixed an issue introduced in [PR#131](https://github.com/Jake-Shadle/xwin/pull/131) where symlink disabling when a case-insensitive file system was detected was...not being respected. At all.

src/ctx.rs

@@ -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(),
@@ -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}")
@@ -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