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')
This commit is contained in:
1 parent
4874d103d7
commit
286340e786
2 files changed
+3
-3
No files matched your search
+1
-1
@@ -107,7 +107,7 @@ for pkg in "${PKGS[@]}"; do
|
|||||||
# override packages nest base-package dirs internally: strip that segment for targets
|
# 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
|
if [ "${pkgname#zz-}" != "$pkgname" ]; then case "$rel" in */*) [ -d "$PKGS_DIR/${rel%%/*}" ] && rel="${rel#*/}";; esac; fi
|
||||||
deploy_file "$f" "$rel"
|
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
|
done
|
||||||
|
|
||||||
if [ "$MODE" != "check" ] && [ -d "$PKGS_DIR/systemd-user/.config/systemd/user" ]; then
|
if [ "$MODE" != "check" ] && [ -d "$PKGS_DIR/systemd-user/.config/systemd/user" ]; then
|
||||||
|
|||||||
+2
-2
@@ -78,13 +78,13 @@ apply_profile() {
|
|||||||
|
|
||||||
ln -sfn "$name.kdl" "$link"
|
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
|
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
|
echo "error: niri validate failed; kept $( [ -n "$old" ] && basename "$old" .kdl || echo 'no' ) profile" >&2
|
||||||
return 1
|
return 1
|
||||||
fi
|
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"
|
notify "switched to $name"
|
||||||
echo "switched to $name"
|
echo "switched to $name"
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in new issue
Block a user