From 8238a754082f8722052324f787c9aed7a619b995 Mon Sep 17 00:00:00 2001 From: Gal Szkolnik Date: Mon, 11 Jul 2022 17:59:11 -0400 Subject: [PATCH] Various updates to sh shortcuts direnv commands terraform commands tmux clipboard hack a better editor detector --- _home/dot_sz.shrc.d/11_direnv.env | 9 +++ _home/dot_sz.shrc.d/22_editor.aliases | 4 +- _home/dot_sz.shrc.d/33_terraform.shortcuts | 84 ++++++++++++++++++++++ _home/dot_sz.shrc.d/34_tmux.tools | 5 ++ 4 files changed, 101 insertions(+), 1 deletion(-) create mode 100644 _home/dot_sz.shrc.d/11_direnv.env create mode 100644 _home/dot_sz.shrc.d/33_terraform.shortcuts create mode 100644 _home/dot_sz.shrc.d/34_tmux.tools diff --git a/_home/dot_sz.shrc.d/11_direnv.env b/_home/dot_sz.shrc.d/11_direnv.env new file mode 100644 index 0000000..7fd5244 --- /dev/null +++ b/_home/dot_sz.shrc.d/11_direnv.env @@ -0,0 +1,9 @@ +if [[ -n "$(which-command direnv)" ]]; then + function _env() { + if [[ -z "$_DIRENV_ShowEnvLogic" ]]; then + echo "_DIRENV_ShowEnvLogic is not defined." + else + eval "$_DIRENV_ShowEnvLogic" | LC_ALL=C sort -h + fi + } +fi diff --git a/_home/dot_sz.shrc.d/22_editor.aliases b/_home/dot_sz.shrc.d/22_editor.aliases index dd5226b..5037973 100644 --- a/_home/dot_sz.shrc.d/22_editor.aliases +++ b/_home/dot_sz.shrc.d/22_editor.aliases @@ -16,8 +16,10 @@ if [[ -r "$HOME/.config/_my.emacs/spacemacs/emacs.d/init.el" \ && -n "$(which-command emacs)" \ && -n "$(which-command edit-with-spacemacs)" \ ]]; then - alias my_editor='edit-with-spacemacs' + EDITOR=$(which-command edit-with-spacemacs | head -1) + alias my_editor="$EDITOR " else + EDITOR="$PREFERRED_VI" alias my_editor='my_vi' fi alias nvim="my_vi" diff --git a/_home/dot_sz.shrc.d/33_terraform.shortcuts b/_home/dot_sz.shrc.d/33_terraform.shortcuts new file mode 100644 index 0000000..3c5711e --- /dev/null +++ b/_home/dot_sz.shrc.d/33_terraform.shortcuts @@ -0,0 +1,84 @@ +TERRAFORM_BIN=$(which-command terraform | head -1) +if [[ -x $TERRAFORM_BIN ]]; then + function tfcontext() { + [[ -n $(find $PWD -name '*.tf') ]] || return -1 + [[ -d _logs ]] || mkdir _logs + TF_VAR_FILE_NAME=${TF_VAR_FILE_CLI-:$(basename $PWD).tfvars} + [[ -r $TF_VAR_FILE_NAME ]] || unset TF_VAR_FILE_NAME + TF_VAR_FILE_CLI=${TF_VAR_FILE_CLI-:-var-file='$TF_VAR_FILE_NAME'} + + basename $PWD + } + + function _tfsedFullStop() { + sed --unbuffered '/^===FULLSTOP===$/q' | sed --unbuffered '/^===FULLSTOP===$/d' + } + + function tf() { + [[ -z "$TF_LOG_TS" ]] && _tfSetLogTS + local NAME=$1 + [[ "${@}" =~ "-destroy" ]] && NAME="$1-destroy" + + echo "===_logs/0_$NAME.log===" > _logs/0_0_lastrun.log + [[ -z "$SZ_DEBUG" ]] || echo "Executing: terraform ${@}" + { + terraform "${@}" 2>&1 \ + | tee _logs/${TF_LOG_TS}_$NAME.log \ + | awk 'BEGIN {p=1}; /<<\W*EOT/ {print; p=0}; /^\W*EOT/ {p=1}; p; fflush();' \ + | tee --append _logs/0_0_lastrun.log \ + >> _logs/0_$NAME.log + + echo "===FULLSTOP===" >> _logs/0_0_lastrun.log + } & + + _tfless _logs/0_0_lastrun.log + } + + function tfp() { + [[ -z "$SZ_DEBUG" ]] || echo "DEBUG: tfplan ${@}" + local _TF_TARGET="" + [[ ${#TF_TARGET} -gt 0 ]] && _TF_TARGET="$(printf -- '--target=%s ' ${TF_TARGET[@]})" + [[ "${@}" =~ "-destroy" ]] && [[ ${#TF_DESTROY_TARGET} -gt 0 ]] && _TF_TARGET="$(printf -- '--target=%s ' ${TF_DESTROY_TARGET[@]})" + + tf plan ${_TF_TARGET} "${@}" + } + + function _tfless() { + local _TF_LOG_FILE=${1-_logs/0_0_lastrun.log} + [[ -z "$SZ_DEBUG" ]] || echo "_tfless: ${@} | LESS_NO_WAIT = '${LESS_NO_WAIT}'" + [[ -n "$1" ]] && { + trap : INT; + tail -f $_TF_LOG_FILE | _tfsedFullStop; + } \ + || { [[ -z "${LESS_NO_WAIT}" ]] \ + && { less \ + --no-init \ + --raw-control-chars \ + --line-numbers \ + --quiet \ + --hilite-unread \ + --incsearch \ + --ignore-case \ + --force \ + "${@:2}" -- \ + "$_TF_LOG_FILE" + #\ + #'+G?([^\w\W][\[0-9m+])Plan:' \ + #'+3k' + } + } + } + + function _tfSetLogTS() { + export TF_LOG_TS=$(date -d "today" +"%Y%m%d%H%M%S") + } + + function tfinit() { + return 0 + } + + function tfplan() { + return 0 + } +fi + diff --git a/_home/dot_sz.shrc.d/34_tmux.tools b/_home/dot_sz.shrc.d/34_tmux.tools new file mode 100644 index 0000000..a5befad --- /dev/null +++ b/_home/dot_sz.shrc.d/34_tmux.tools @@ -0,0 +1,5 @@ +if [[ -n "$(which-command tmux)" ]]; then + function clip-tmux() { + tmux save-buffer -a - | clip + } +fi