rootiest/fish-config
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(logging): restore AUR progress bars and render clean colored logs #44

Merged
rootiest merged 5 commits from fix/aur-wrapper-pty-progress-bars into main 2026-06-12 03:02:21 +00:00
Conversation 0 Commits 5 Files Changed 5
+6 -14
2 changed files with 6 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit bd0eac8413 - Show all commits
conf.d/paru-wrapper.fish
+3 -7
View File
@@ -20,7 +20,7 @@ end
set -l _paru_real /usr/bin/paru set -l _paru_real /usr/bin/paru
set -l _paru_wrapper "$HOME/.local/bin/paru" set -l _paru_wrapper "$HOME/.local/bin/paru"
set -l _paru_wrapper_version 3 set -l _paru_wrapper_version 4
# Skip entirely if the real paru binary isn't present # Skip entirely if the real paru binary isn't present
test -x $_paru_real; or return test -x $_paru_real; or return
@@ -54,12 +54,8 @@ printf '%s\n' \
'script -q -e -c "$cmd_str" "$log_file"' \ 'script -q -e -c "$cmd_str" "$log_file"' \
'exit_code=$?' \ 'exit_code=$?' \
'' \ '' \
'# col -bp collapses CR-redrawn progress bar frames; sed strips ANSI codes and script(1) headers.' \ '# Collapse CR-redrawn frames; keep ANSI codes for ov rendering; strip script(1) headers.' \
'if col -bp < "$log_file" | sed '"'"'s/\x1b\[[0-9;?]*[a-zA-Z]//g; /^Script \(started\|done\)/d'"'"' > "${log_file}.tmp" 2>/dev/null; then' \ 'perl -ne '"'"'next if /^Script (started|done)/; s/\r$//; s/.*\r([^\r]+)$/$1/; print'"'"' < "$log_file" > "${log_file}.tmp" 2>/dev/null && mv "${log_file}.tmp" "$log_file" || rm -f "${log_file}.tmp"' \
' mv "${log_file}.tmp" "$log_file"' \
'else' \
' rm -f "${log_file}.tmp"' \
'fi' \
'' \ '' \
'max_files="${SCROLLBACK_HISTORY_MAX_FILES:-100}"' \ 'max_files="${SCROLLBACK_HISTORY_MAX_FILES:-100}"' \
'mapfile -t logs < <(ls -1t "$log_dir"/paru_*.log 2>/dev/null)' \ 'mapfile -t logs < <(ls -1t "$log_dir"/paru_*.log 2>/dev/null)' \
conf.d/yay-wrapper.fish
+3 -7
View File
@@ -20,7 +20,7 @@ end
set -l _yay_real /usr/bin/yay set -l _yay_real /usr/bin/yay
set -l _yay_wrapper "$HOME/.local/bin/yay" set -l _yay_wrapper "$HOME/.local/bin/yay"
set -l _yay_wrapper_version 3 set -l _yay_wrapper_version 4
# Skip entirely if the real yay binary isn't present # Skip entirely if the real yay binary isn't present
test -x $_yay_real; or return test -x $_yay_real; or return
@@ -54,12 +54,8 @@ printf '%s\n' \
'script -q -e -c "$cmd_str" "$log_file"' \ 'script -q -e -c "$cmd_str" "$log_file"' \
'exit_code=$?' \ 'exit_code=$?' \
'' \ '' \
'# col -bp collapses CR-redrawn progress bar frames; sed strips ANSI codes and script(1) headers.' \ '# Collapse CR-redrawn frames; keep ANSI codes for ov rendering; strip script(1) headers.' \
'if col -bp < "$log_file" | sed '"'"'s/\x1b\[[0-9;?]*[a-zA-Z]//g; /^Script \(started\|done\)/d'"'"' > "${log_file}.tmp" 2>/dev/null; then' \ 'perl -ne '"'"'next if /^Script (started|done)/; s/\r$//; s/.*\r([^\r]+)$/$1/; print'"'"' < "$log_file" > "${log_file}.tmp" 2>/dev/null && mv "${log_file}.tmp" "$log_file" || rm -f "${log_file}.tmp"' \
' mv "${log_file}.tmp" "$log_file"' \
'else' \
' rm -f "${log_file}.tmp"' \
'fi' \
'' \ '' \
'max_files="${SCROLLBACK_HISTORY_MAX_FILES:-100}"' \ 'max_files="${SCROLLBACK_HISTORY_MAX_FILES:-100}"' \
'mapfile -t logs < <(ls -1t "$log_dir"/yay_*.log 2>/dev/null)' \ 'mapfile -t logs < <(ls -1t "$log_dir"/yay_*.log 2>/dev/null)' \