From 96a6ba196c72e955c3db822d93da38fce8cd7045 Mon Sep 17 00:00:00 2001
From: SulfurNitride <SulfurNitride@users.noreply.github.com>
Date: Thu, 23 Apr 2026 16:09:59 -0500
Subject: Fix VFS rmdir, prefix/launch issues, add version + beta channel
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- VFS: add mo2_rmdir + OverwriteManager::removeDirectory so Wrye Bash
  shutil.rmtree stops failing with WinError 267 (issue #47).
- FileRenamer: case-insensitive fallback via new resolvePathCaseInsensitive
  walks each path component; bulk hide in Conflict tab no longer dies with
  a misleading "Input/output error" when DirectoryEntry normalised parent
  dir case (issue #54). formatSystemMessage stops aliasing Windows error
  code 5 to errno 5 (EIO).
- Versioning: FLUORINE_VERSION_* + fluorine_build_info.h generated from
  CMake; Linux createVersionInfo returns Fluorine's version. About dialog
  shows Fluorine version + MO2 engine + commit. Beta builds stamp
  "<semver>B<yyyymmddhhmm>" (issue #51).
- CI: ci.yml determines channel from ref (v* tags = stable, main = beta),
  publishes a rolling `beta` GitHub release whose body carries a
  machine-parseable fluorine-meta block (timestamp, commit) for the
  in-app updater.
- Updater: new FluorineUpdater polls GitHub API on startup, compares
  against embedded metadata, notifies on new release without auto-install.
  Channel toggle piggybacks on the existing "beta versions" checkbox.
- Bethesda plugins: determineMyGamesPath no longer creates
  Documents/My Games/<GameName> for every possible title at plugin load;
  only games with a detected install path get their dirs created
  (issue #55).
- Starfield: dataDirectory() on Linux now points at <game>/Data instead
  of My Games/Starfield/Data so the single FUSE mount lands where SFSE
  loads plugins; My Games Data becomes a secondary symlinked mapping
  (issue #56).
- Prefix resolution: prefer Fluorine config, then explicit
  fluorine/prefix_path, then legacy Settings/* keys (with a warning) so
  auto-detected Heroic/Bottles prefixes can't silently override a user-
  configured Fluorine prefix (issue #52). compatDataPathFromPrefix no
  longer hands Proton the wrong parent dir for plain wine prefixes.
- xrandr: ensureXrandrInstalled back-fills the helper for existing SLR
  installs, prefix init runs it before wineboot, SLR wrap exposes
  xrandr-bin via --filesystem= and prepends PATH inside the container
  (issue #49).
- Process tracking: drop the wineserver-as-last-resort fallback that made
  MO2 hang on Proton's session manager after game exit. Rescan the prefix
  for matching game executables instead (covers reparented launcher
  children like f4se_loader → Fallout4.exe). Unlock button now kills
  wineserver for the prefix (SIGTERM then SIGKILL on timeout).

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
---
 docker/build-inner.sh | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'docker')

diff --git a/docker/build-inner.sh b/docker/build-inner.sh
index d272de5..c7bb131 100755
--- a/docker/build-inner.sh
+++ b/docker/build-inner.sh
@@ -22,12 +22,21 @@ fi
 
 PYTHON_ROOT="$(dirname "$(dirname "${BUILD_PY}")")"
 
+# Forward version/channel settings from the CI workflow (or local overrides).
+# Defaults: stable channel, empty timestamp/commit (CMake fills commit from git).
+FLUORINE_BUILD_CHANNEL="${FLUORINE_BUILD_CHANNEL:-stable}"
+FLUORINE_BUILD_TIMESTAMP="${FLUORINE_BUILD_TIMESTAMP:-}"
+FLUORINE_BUILD_COMMIT="${FLUORINE_BUILD_COMMIT:-}"
+
 cmake -S . -B build -G Ninja \
     -DCMAKE_BUILD_TYPE=RelWithDebInfo \
     -DPython_EXECUTABLE="${BUILD_PY}" \
     -DPython_ROOT_DIR="${PYTHON_ROOT}" \
     ${PYBIND11_DIR:+-Dpybind11_DIR="${PYBIND11_DIR}"} \
     -DBUILD_PLUGIN_PYTHON=ON \
+    -DFLUORINE_BUILD_CHANNEL="${FLUORINE_BUILD_CHANNEL}" \
+    -DFLUORINE_BUILD_TIMESTAMP="${FLUORINE_BUILD_TIMESTAMP}" \
+    -DFLUORINE_BUILD_COMMIT="${FLUORINE_BUILD_COMMIT}" \
     "${CMAKE_EXTRA_ARGS[@]}"
 
 cmake --build build --parallel
-- 
cgit v1.3.1