From 286340e786af2a78d8502f12b45e69b94d9a63a4 Mon Sep 17 00:00:00 2001 From: Frank Date: Fri, 9 Oct 2026 14:43:05 -0700 Subject: [PATCH] fix(deploy): skip .AGENTTRASH in packages; deploy repo symlinks (desk.sh); retire base display.kdl desk.sh: silence niri validate / load-config-file stdout (was leaking 'ok') --- scripts/deploy.sh | 2 +- scripts/desk.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/deploy.sh b/scripts/deploy.sh index ea6986a..34c2a68 100755 --- a/scripts/deploy.sh +++ b/scripts/deploy.sh @@ -107,7 +107,7 @@ for pkg in "${PKGS[@]}"; do # override packages nest base-package dirs internally: strip that segment for targets if [ "${pkgname#zz-}" != "$pkgname" ]; then case "$rel" in */*) [ -d "$PKGS_DIR/${rel%%/*}" ] && rel="${rel#*/}";; esac; fi deploy_file "$f" "$rel" - done < <(find "$pkg" -type f ! -name 'dump.txt' -print0) + done < <(find "$pkg" \( -type f -o -type l \) ! -name 'dump.txt' ! -path '*/.AGENTTRASH/*' -print0) done if [ "$MODE" != "check" ] && [ -d "$PKGS_DIR/systemd-user/.config/systemd/user" ]; then diff --git a/scripts/desk.sh b/scripts/desk.sh index c0b8ed1..71d355b 100755 --- a/scripts/desk.sh +++ b/scripts/desk.sh @@ -78,13 +78,13 @@ apply_profile() { ln -sfn "$name.kdl" "$link" - if ! "$NIRI" validate 2>/dev/null; then + if ! "$NIRI" validate >/dev/null 2>/dev/null; then if [ -n "$old" ]; then ln -sfn "$old" "$link"; else rm -f "$link"; fi echo "error: niri validate failed; kept $( [ -n "$old" ] && basename "$old" .kdl || echo 'no' ) profile" >&2 return 1 fi - "$NIRI" msg action load-config-file 2>/dev/null || true + "$NIRI" msg action load-config-file >/dev/null 2>/dev/null || true notify "switched to $name" echo "switched to $name" }