From 857aa4ff2e8ba17cf5d4545363efb55d05b6a405 Mon Sep 17 00:00:00 2001 From: Anton Volnuhin Date: Tue, 3 Mar 2026 20:25:13 +0300 Subject: [PATCH] fix tic warning output and nvim padding issues - Pipe tic stderr through pad so ghostty terminfo warning is formatted - Strip all ANSI escapes (not just colors) and carriage returns from nvim output so every line goes through pad correctly Co-Authored-By: Claude Opus 4.6 --- run_onchange_after_install_main_deps.sh.tmpl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/run_onchange_after_install_main_deps.sh.tmpl b/run_onchange_after_install_main_deps.sh.tmpl index 4e098b4..bcfbaa7 100644 --- a/run_onchange_after_install_main_deps.sh.tmpl +++ b/run_onchange_after_install_main_deps.sh.tmpl @@ -258,7 +258,7 @@ new_line "Install base packages" ## Install ghostty terminfo if not already present if ! infocmp xterm-ghostty >/dev/null 2>&1; then - cat <<'GHOSTTY_TERMINFO' | $SUDO tic -x - + cat <<'GHOSTTY_TERMINFO' | $SUDO tic -x - 2>&1|pad xterm-ghostty|ghostty|Ghostty, am, bce, ccc, hs, km, mc5i, mir, msgr, npc, xenl, AX, Su, Tc, XT, fullkbd, colors#256, cols#80, it#8, lines#24, pairs#32767, @@ -444,7 +444,7 @@ cat ~/.ssh/authorized_keys.old <(echo "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPdqI if [ "$SKIP_NVIM_BOOTSTRAP" -eq 0 ]; then new_line "Waiting for neovim plugins and lsm compilations..." -STRIP_ANSI="sed s/$(printf '\033')\[[0-9;]*m//g" +STRIP_ANSI="sed -e s/$(printf '\033')\[[0-9;]*[a-zA-Z]//g -e s/$(printf '\r')//g" TERM=dumb ${TIMEOUT_BIN:+$TIMEOUT_BIN 120s} nvim --headless -c "sleep 1" -c ":Lazy! sync" -c "sleep 10" -c "qa" 2>&1|$STRIP_ANSI|pad TERM=dumb ${TIMEOUT_BIN:+$TIMEOUT_BIN 120s} nvim --headless -c "sleep 1" -c ":lua pcall(vim.cmd, 'MasonUpdate')" -c "sleep 5" -c "qa" 2>&1|$STRIP_ANSI|pad TERM=dumb ${TIMEOUT_BIN:+$TIMEOUT_BIN 120s} nvim --headless -c "sleep 1" -c ":lua pcall(vim.cmd, 'MasonInstall lua-language-server')" -c "sleep 5" -c "qa" 2>&1|$STRIP_ANSI|pad