Adds a dot setup subcommand family (idempotent, re-runnable machine-setup tasks) with a folders task that brings the 8 standard XDG user directories under a fixed short-name convention (Desktop -> .desktop, Documents -> doc, Downloads -> dwn, Music -> mus, Pictures -> pic, Videos -> vid, Templates/Public -> .ignoreme), hardcoded rather than read from ~/.config/user-dirs.dirs -- that file is a separate, manually tracked dotfile whose values can drift or go stale, and the migration must not depend on it being correct. The nested Pictures/Screenshots folder is renamed to pic/screenshots in the same pass. Content left behind in a legacy full-named folder by a fresh XDG-defaults install -- empty or not -- is merged into its short-named replacement. A same-named collision between a legacy folder and its target is never overwritten: it is skipped, reported, and the legacy folder is left in place rather than deleted while something in it could not be merged. --dry-run previews what would move/skip without touching the filesystem. xdg-user-dirs-update runs once afterward to notify running apps/portals.
2.8 KiB
2.8 KiB
spec, blocked-by
| spec | blocked-by |
|---|---|
| dot-setup-folders | 0006-setup-dispatcher-and-folders-core |
What to build
Extend dot setup folders's migration so a legacy folder found non-empty
(any entry at all, including a stray dotfile or KDE metadata like a
.directory file, counts as non-empty) stops and prints what would be moved,
then refuses to proceed unless an explicit --yes flag was passed on the
command line — no interactive prompt. With --yes, the migration proceeds
for that folder the same way the empty-folder path already does.
This applies uniformly across all 8 mapped categories, including the nested
Pictures/Screenshots→pic/screenshots rename from the prior slice: a
non-empty Screenshots folder is also gated behind the same confirmation
rule.
Acceptance criteria
- A legacy folder with real content (a real file, not just an empty
directory) refuses to migrate without
--yes, prints what would have been moved, and leaves the folder and its contents untouched - The same legacy folder migrates successfully when
--yesis passed - A legacy folder containing only a stray dotfile/metadata file (e.g. a
fake
.directory) is still treated as non-empty and triggers the same confirmation gate ~/.config/dot/tests/dot.fishcovers the above cases andfishtape ~/.config/dot/tests/dot.fishpasses
Implementation Notes
--yes's actual move reuses the exact same branch shape as the existing silent-empty path (renameScreenshots→screenshotswhen present, thenrmdirthe legacy folder), extended to alsomvany remaining top-level entries into the target first. Screenshots is always moved as one atomic unit — its individual files are never mv'd/reported separately — so a non-emptyScreenshots(own acceptance criterion in the parent spec) is gated and migrated the same way a non-empty top-level file would be.- Collision handling (no-clobber
mv -n, reporting skipped files, leaving the legacy folder in place on a collision) is explicitly out of scope here — it's owned by 0008-folders-collision-handling.md, per that task's own frontmatter/spec section. The--yespath added here uses a plainmv. /review-uncommittedflagged two minor issues, both fixed: a stale comment claiming a helper variable was used by both the silent-empty and--yespaths when it was only read by the latter, and a duplicatedfindinvocation computing the same top-level listing twice under one condition (now computed once and reused). It also flagged the non-empty "would move" preview listing recursively-nested files individually instead of treatingScreenshotsas one unit like the real move does — fixed so the preview and the actual move share the same top-level-entries list.