From 619e0f6c7079c0e09b53a7532f9abc210650d4a0 Mon Sep 17 00:00:00 2001 From: sommerfeld Date: Tue, 21 Apr 2026 01:23:49 +0100 Subject: feat(justfile): add etc-rm recipe MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Removes one or more files from the repo's etc/ tree and tidies any now-empty parent directories (bounded to inside etc/). Leaves the live /etc copy untouched. Composes with etc-reset to stop tracking a file cleanly: just etc-reset /etc/foo.conf # repo → pristine just apply # deploy pristine to /etc just etc-rm etc/foo.conf # stop tracking; /etc unchanged --- justfile | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) (limited to 'justfile') diff --git a/justfile b/justfile index 212730a..0094a12 100644 --- a/justfile +++ b/justfile @@ -334,6 +334,29 @@ etc-add +paths: echo echo "Run 'chezmoi apply' to sync (no-op content-wise, refreshes deploy hash)." +# Remove one or more files from the repo's etc/ tree (leaves live /etc untouched) +etc-rm +paths: + #!/usr/bin/env bash + set -eo pipefail + for raw in {{ paths }}; do + case "$raw" in + *..*|*/./*|./*|../*) echo "error: unsafe path: $raw" >&2; exit 1 ;; + esac + p=${raw#/}; p=${p#etc/} + repo=etc/$p + [ -f "$repo" ] || { echo "error: $repo is not managed in the repo" >&2; exit 1; } + rm -- "$repo" + # Tidy empty parent dirs inside etc/ without walking out of it + parent=$(dirname "$repo") + while [ "$parent" != "etc" ] && [ "$parent" != "." ]; do + rmdir -- "$parent" 2>/dev/null || break + parent=$(dirname "$parent") + done + echo "removed: $repo (/etc/$p left untouched)" + done + echo + echo "Run 'just apply' to refresh the deploy-etc hash." + # Reset repo-managed etc/ to pristine pacman contents (run 'just apply' afterward) etc-reset +paths: #!/usr/bin/env bash -- cgit v1.2.3-70-g09d2