feat(installer): implement Phase 3 — the patch tier
Some checks failed
PR Checks / rust-gates (pull_request) Failing after 46s
Some checks failed
PR Checks / rust-gates (pull_request) Failing after 46s
Two features need edits to stock ServUO sources, because the events they depend on do not exist. This adds the rung ladder of PLAN.md §2.2.1, the unsupported-version path of §2.2.2, and the record and cache Phase 4 will read. Three decisions were not settled by the plan: * The engine is fully native, with no `git`. §2.2.1 wrote rung 1 as "apply verbatim with git apply", but §1 chose the release tarball specifically so there would be no git on the shard host, and rung 2 needs a native applier regardless. Rung 1 keeps its distinct, stronger verdict — the whole file reproduced the diff's `index` pre-image, computed as a git blob SHA1 in process — while the write goes through the same code path as rung 2. On the real trees here that is not academic: the shipped .patch files are CRLF in a Windows checkout and two of their three targets are LF, so `git apply` refuses patches this applies correctly. * Per-patch metadata is declared by the release, with a built-in fallback. Which patches form one all-or-nothing unit, which companion .cs follows which, whether a CORE rebuild is needed and what declining costs are not derivable from a diff. servuo-plugins now declares them; overlay v0.1.1 is in the current bundle and declares nothing, so a built-in copy stands in for it. A checked-in fixture of the release workflow's own jq output asserts the two descriptions are identical, so the repos cannot drift quietly. * Pre-images are cached in the state directory. The tier edits files the operator owns, and `/etc/runicgateway/patches/originals/` is what turns "here are the hunks we added" into a revert anyone can verify — kept out of the ServUO tree, which uninstall has promised never to clean up. Everything else follows §2.2.1: exact matching with only line-ending and trailing-whitespace normalization, exactly one occurrence or it fails, all-or-nothing per patch file and again per feature, and a byte-preserving splice so nothing outside a hunk can be reformatted. Verified against the ServUO 57.4 tree on this machine across four scratch roots: a hand-patched tree (rung 0), a reverse-applied stock one (rung 1 on the real EventSink.cs, its blob matching the patch's declared pre-image), a mixed-rung feature, a tree with edits inside two patched regions (rung 3 — nothing written, nothing held back applied, no companions copied), and a non-57.4 tree both with and without the extra consent flag. Three consecutive runs left install.json byte-identical and the cached pre-image still pre-patch. Three reporting defects the live runs caught are fixed with tests: a dry run and a held-back patch both claimed to be "applied", the core-rebuild warning fired when nothing had been written and named a Scripts file as core, and a declined tier announced the loss of features install.json showed as applied. Refused patches are now cached too, since the refusal message names that path. Refs: docs/installer/PLAN.md §2.2, §5 Phase 3 Co-Authored-By: Claude <noreply@anthropic.com>
This commit is contained in:
21
src/paths.rs
21
src/paths.rs
@@ -47,6 +47,27 @@ impl Layout {
|
||||
self.data_dir.join("uo-link.db")
|
||||
}
|
||||
|
||||
/// `/etc/runicgateway/patches` — the cached patch set (INSTALL.md §3).
|
||||
///
|
||||
/// Every patch the tier *evaluated* is cached here, not only the ones that applied. `uninstall`
|
||||
/// needs the applied ones to print the exact hunks to revert long after the release tarball is
|
||||
/// gone (PLAN.md §5), and a refused one is the file the run just told the operator to apply by
|
||||
/// hand — pointing them at a path that only exists on success would be the less useful half.
|
||||
pub fn patches_dir(&self) -> PathBuf {
|
||||
self.state_dir.join("patches")
|
||||
}
|
||||
|
||||
/// `/etc/runicgateway/patches/originals` — each patched file exactly as it was before the tier
|
||||
/// first touched it, mirroring its path in the ServUO tree.
|
||||
///
|
||||
/// The tier edits files the operator owns, so the pre-image is what turns "here are the hunks
|
||||
/// we added" into a revert anyone can verify. It lives here rather than beside the file it
|
||||
/// copies, because an installer-owned file inside the ServUO tree is one `uninstall` has
|
||||
/// promised never to clean up.
|
||||
pub fn patch_originals_dir(&self) -> PathBuf {
|
||||
self.patches_dir().join("originals")
|
||||
}
|
||||
|
||||
/// The unit file a systemd host gets. Meaningless elsewhere, and unused under a relocated
|
||||
/// layout, where no service is registered at all.
|
||||
pub fn systemd_unit(&self) -> PathBuf {
|
||||
|
||||
Reference in New Issue
Block a user