From 7e266cb61a139a6f652bedc95f13a2cb69fdefcd Mon Sep 17 00:00:00 2001 From: rootiest Date: Wed, 10 Jun 2026 21:33:54 -0400 Subject: [PATCH] feat(logging): gate paru/yay wrapper generation under C5 guard (Tasks 5-6) Add C5 (Logging & Capture) guard to wrapper generation in both conf.d/paru-wrapper.fish and conf.d/yay-wrapper.fish. When C5 logging is disabled, the guard removes any generated wrapper and returns early, allowing the system to fall back to the bare binary. Also replaces stale Task #4 comment references with C5 classification. --- conf.d/paru-wrapper.fish | 11 ++++++++++- conf.d/yay-wrapper.fish | 11 ++++++++++- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/conf.d/paru-wrapper.fish b/conf.d/paru-wrapper.fish index da9db45..2bb7de5 100644 --- a/conf.d/paru-wrapper.fish +++ b/conf.d/paru-wrapper.fish @@ -6,9 +6,18 @@ # timestamped log file and prunes old logs, mirroring smart_exit behavior. # Auto-generating a wrapper in ~/.local/bin is opinionated (C2 auto-exec). -# Task #4's __fish_config_enable_logging will additionally gate this wrapper. +# Wrapper generation is also gated by C5 (Logging & Capture). __fish_config_op_enabled __fish_config_op_autoexec; or return +# C5 — Logging & Capture: remove generated wrapper and skip when logging is off +if not __fish_config_op_enabled __fish_config_op_logging + if test -f "$HOME/.local/bin/paru" + and grep -q "# paru-wrapper-version:" "$HOME/.local/bin/paru" 2>/dev/null + rm -f "$HOME/.local/bin/paru" + end + return +end + set -l _paru_real /usr/bin/paru set -l _paru_wrapper "$HOME/.local/bin/paru" set -l _paru_wrapper_version 1 diff --git a/conf.d/yay-wrapper.fish b/conf.d/yay-wrapper.fish index 258f1ec..4e16e05 100644 --- a/conf.d/yay-wrapper.fish +++ b/conf.d/yay-wrapper.fish @@ -6,9 +6,18 @@ # timestamped log file and prunes old logs, mirroring smart_exit behavior. # Auto-generating a wrapper in ~/.local/bin is opinionated (C2 auto-exec). -# Task #4's __fish_config_enable_logging will additionally gate this wrapper. +# Wrapper generation is also gated by C5 (Logging & Capture). __fish_config_op_enabled __fish_config_op_autoexec; or return +# C5 — Logging & Capture: remove generated wrapper and skip when logging is off +if not __fish_config_op_enabled __fish_config_op_logging + if test -f "$HOME/.local/bin/yay" + and grep -q "# yay-wrapper-version:" "$HOME/.local/bin/yay" 2>/dev/null + rm -f "$HOME/.local/bin/yay" + end + return +end + set -l _yay_real /usr/bin/yay set -l _yay_wrapper "$HOME/.local/bin/yay" set -l _yay_wrapper_version 1