install.sh: merge PERSONAL_DIRS contents instead of wholesale replace

Browse Source

The previous deploy_one() did `mv $HOME/<dir> $BACKUP_DIR/<dir>` then
`cp -a $YADR_DIR/<dir> $HOME/<dir>` for every entry in PERSONAL_DIRS.
For dirs the repo only partially populates (notably .local — repo only
tracks .local/bin/), this swept away unrelated user data: the most
recent re-bootstrap moved ~/.local/share/fonts/ (Intel One Mono, Open
Gorton, Roboto Mono, GALLAUDET, code128) into the timestamped backup,
making them appear missing.

Rework deploy logic:
- deploy_file: copies one file/symlink, backing up only the conflicting
  destination (if any). Idempotent via paths_equivalent() so re-runs
  with no changes produce no output and no spurious backups.
- deploy_dir: walks the repo's tree for that dir and deploys each leaf
  via deploy_file. Files in $HOME the repo doesn't know about are left
  untouched. Subdirs are mkdir'd as needed.

Also: track the personal fonts at .local/share/fonts/ so they redeploy
on every install, and run fc-cache -f at the end so apps see them
without a logout/login.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

...

This commit is contained in:

Dustin Williams

2026-04-27 06:50:52 -07:00

parent 065686f341

commit 1d7df94a1d

15 changed files with 74 additions and 14 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

BIN

.local/share/fonts/GALLAUDET.ttf Normal file

Binary file not shown.

BIN

.local/share/fonts/IntelOneMono-Bold.ttf Normal file

Binary file not shown.

BIN

.local/share/fonts/IntelOneMono-BoldItalic.ttf Normal file

Binary file not shown.

BIN

.local/share/fonts/IntelOneMono-Italic.ttf Normal file

Binary file not shown.

BIN

.local/share/fonts/IntelOneMono-Light.ttf Normal file

Binary file not shown.

BIN

.local/share/fonts/IntelOneMono-LightItalic.ttf Normal file

Binary file not shown.

BIN

.local/share/fonts/IntelOneMono-Medium.ttf Normal file

Binary file not shown.

BIN

.local/share/fonts/IntelOneMono-MediumItalic.ttf Normal file

Binary file not shown.

BIN

.local/share/fonts/IntelOneMono-Regular.ttf Normal file

Binary file not shown.

BIN

.local/share/fonts/OpenGorton-Bold.otf Normal file

Binary file not shown.

BIN

.local/share/fonts/OpenGorton-Regular.otf Normal file

Binary file not shown.

BIN

.local/share/fonts/RobotoMono-Italic-VariableFont_wght.ttf Normal file

Binary file not shown.

BIN

.local/share/fonts/RobotoMono-VariableFont_wght.ttf Normal file

Binary file not shown.

BIN

.local/share/fonts/code128.ttf Normal file

Binary file not shown.