diff options
| author | Mike Vink <mike.vink@stater.nl> | 2023-04-24 18:31:20 +0200 |
|---|---|---|
| committer | Mike Vink <mike.vink@stater.nl> | 2023-04-24 18:31:20 +0200 |
| commit | 2ae625f60819b9d6bc46d5a3926d53b3d2838ef7 (patch) | |
| tree | ab2ff6b1b0748bd2330cb82fdfcf88c686da0139 | |
| parent | e2b0db1ece5e8dfad49e8f2ea72dca4f34681a4d (diff) | |
fixup
| -rw-r--r-- | shell-scripts/compile | 5 | ||||
| -rwxr-xr-x | shell-scripts/filter-ansi | 2 | ||||
| -rwxr-xr-x | shell-scripts/terragrunt | 4 |
3 files changed, 6 insertions, 5 deletions
diff --git a/shell-scripts/compile b/shell-scripts/compile index 8e74ffa..83812e8 100644 --- a/shell-scripts/compile +++ b/shell-scripts/compile @@ -17,6 +17,11 @@ case "${@}" in echo " \-> ansible-lint --profile production --write=all -qq --nocolor" ansible-lint --profile production --write=all -qq --nocolor ${@} ;; + ansible-playbook*) + shift + echo " \-> ansible-playbook -e@<(pass)" + ansible-playbook -e $PASSWORD ${@} + ;; awx*) echo " \-> awx" awx "$@" | filter-ansi diff --git a/shell-scripts/filter-ansi b/shell-scripts/filter-ansi index 2b4cf23..da77abf 100755 --- a/shell-scripts/filter-ansi +++ b/shell-scripts/filter-ansi @@ -1,2 +1,2 @@ # #!@bash@/bin/bash -cat - | sed -E -e 's/\x1b\[[0-9;]*[mGKHF]|\r//g' +cat - | sed -u -E -e 's/\x1b\[[0-9;]*[mGKHF]|\r//g' diff --git a/shell-scripts/terragrunt b/shell-scripts/terragrunt index 7b3ea92..007ee26 100755 --- a/shell-scripts/terragrunt +++ b/shell-scripts/terragrunt @@ -55,9 +55,6 @@ case ${TERRAGRUNT_ARGS[0]} in init) TERRAGRUNT_ARGS+=(-no-color -compact-warnings) ;; - *) - exit 1 - ;; esac VARIABLES="" @@ -90,7 +87,6 @@ WORKDIR="$ENVIRONMENTS/$ENV/$MODULE" # TODO(mike): how to do concise mode | grep -E '(^.*[#~+-] .*|^[[:punct:]]|Plan)' # TODO(mike): check expiry of azure directory # echo "docker run --rm -i $TTY $VARIABLES -v $HOME/.terragrunt-cache:/tmp -v $HOME/.azure:/root/.azure -v $HOME/.netrc:/root/.netrc $TERRAGRUNT_EXTRA_MOUNTS -v ${REPO}:${REPO} -w ${WORKDIR} $TERRAGRUNT_CONTAINER terragrunt ${TERRAGRUNT_ARGS[@]} | grep -E '(^.*[#~+-] .*|^[[:punct:]]|Plan|Enter)'" -echo $VARIABLES if [[ $FULL -eq 0 ]]; then docker run --rm -i $TTY $VARIABLES -v $HOME/.terragrunt-cache:/tmp -v $HOME/.azure:/root/.azure -v $HOME/.netrc:/root/.netrc $EXTRA_MOUNTS -v ${REPO}:${REPO} -w ${WORKDIR} $TERRAGRUNT_CONTAINER terragrunt ${TERRAGRUNT_ARGS[@]} | filter-ansi | grep --line-buffered -E '(^ .*[#~+-] .*|^[[:punct:]]|^Plan.*|^\S.*)' else |