From 918357587182a16fe7dde77cb5bfc3db0598565b Mon Sep 17 00:00:00 2001 From: Mike Vink Date: Sat, 22 Apr 2023 00:36:44 +0200 Subject: fix plans --- shell-scripts/filter-ansi | 4 ++-- shell-scripts/news | 2 +- shell-scripts/terragrunt | 8 ++++++++ 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/shell-scripts/filter-ansi b/shell-scripts/filter-ansi index 62999a9..2b4cf23 100755 --- a/shell-scripts/filter-ansi +++ b/shell-scripts/filter-ansi @@ -1,2 +1,2 @@ -#!@bash@/bin/bash -cat - | sed -e 's/\x1b\[[0-9;]*m//g' +# #!@bash@/bin/bash +cat - | sed -E -e 's/\x1b\[[0-9;]*[mGKHF]|\r//g' diff --git a/shell-scripts/news b/shell-scripts/news index a0ea004..097582b 100755 --- a/shell-scripts/news +++ b/shell-scripts/news @@ -1,5 +1,5 @@ #!@bash@/bin/bash cat <(cat ~/.config/newsboat/urls) <(for url in $(env | grep NEWSBOAT_URL_); do - printf '%s' ${url#NEWSBOAT_URL_*=} + printf '%s\n' ${url#NEWSBOAT_URL_*=} done) > ~/.newsboat-urls newsboat -u ~/.newsboat-urls diff --git a/shell-scripts/terragrunt b/shell-scripts/terragrunt index b7a512b..060bc38 100755 --- a/shell-scripts/terragrunt +++ b/shell-scripts/terragrunt @@ -45,6 +45,14 @@ case ${TERRAGRUNT_ARGS[0]} in ;; apply|destroy) TTY="-t" + for arg in $TERRAGRUNT_ARGS; do + if [[ $arg -eq "gruntplan" ]]; then + TTY="" + fi + done + TERRAGRUNT_ARGS+=(-no-color -compact-warnings) + ;; + init) TERRAGRUNT_ARGS+=(-no-color -compact-warnings) ;; *) -- cgit v1.2.3