Cleanup behavior to function when things are missing

_home/dot_sz.shrc.d/00_byobu

@@ -1,5 +1,4 @@
-if [ -z $_byobu_sourced ]; then
+if [[ -z "$_byobu_sourced" && -x /usr/bin/byobu-launch ]]; then
   _byobu_sourced=1 . /usr/bin/byobu-launch 2>/dev/null || true
-  exit
 fi
 

_home/dot_sz.shrc.d/10_bin.path

@@ -1,9 +1,9 @@
 # set PATH so it includes user's private bin if it exists
-if [ -d "$HOME/bin" ] ; then
+if [[ -d "$HOME/bin" ]] ; then
     export PATH="~/bin:$PATH"
 fi
 
 # set PATH so it includes user's private bin if it exists
-if [ -d "$HOME/.local/bin" ] ; then
+if [[ -d "$HOME/.local/bin" ]] ; then
     export PATH="~/.local/bin:$PATH"
 fi

_home/dot_sz.shrc.d/21_aliases

@@ -1,7 +1,10 @@
 alias sudo="/usr/bin/sudo "
-alias nvim="/usr/bin/nvim -p "
-alias vim="nvim "
-alias vi="nvim "
+PREFERED_VI=$(type -fP nvim vim | head -1)
+[[ -z "$PREFERED_VI" ]] && PREFERED_VI=$(type -fP vi | head -1) || alias vi_editor="$PREFERED_VI -p "
+[[ -z "$PREFERED_VI" ]] && alias vi_editor='eval $EDITOR '      || alias vi_editor="$PREFERED_VI "
+alias nvim="vi_editor "
+alias vim="vi_editor "
+alias vi="vi_editor "
 
 alias lessr="less --raw-control-chars "
 

_home/dot_sz.shrc.d/97_keyboard_mappings

@@ -0,0 +1,5 @@
+if [[ -n "$(type -fP setxkbmap)" ]]; then 
+  setxkbmap -option
+  setxkbmap -option caps:escape
+  setxkbmap -option caps:ctrl_modifier
+fi

_home/dot_sz.shrc.d/98_chezmoi.changes

@@ -0,0 +1,5 @@
+if [[ -n "$(type -fP chezmoi)" ]]; then
+  CHEZMOI_OUT="$(chezmoi status || true)x"
+  [[ -n "$CHEZMOI_OUT" ]] && printf "\nChezmoi changes:\n" && echo "${CHEZMOI_OUT%?}"
+  unset CHEZMOI_OUT
+fi

_home/dot_sz.shrc.d/99_chezmoi.changes

@@ -1 +0,0 @@
-chezmoi status || true

_home/dot_sz.shrc.d/99_final_newline

@@ -0,0 +1 @@
+echo ""

_home/dot_sz.shrc.d/99_keyboard_mappings

@@ -1,3 +0,0 @@
-setxkbmap -option
-setxkbmap -option caps:escape
-setxkbmap -option caps:ctrl_modifier

_home/dot_sz.shrc.d/bash.post/10_oh-my-posh

@@ -1 +1,6 @@
-eval "$(oh-my-posh init bash --config ~/.poshtheme.omp.json)"
+if [[ -n "$(type -fP oh-my-posh)" ]]; then
+  OHMYPOSH_CONFIG=''
+  [[ -r ~/.poshtheme.omp.json ]] && OHMYPOSH_CONFIG="~/.poshtheme.omp.json"
+  eval "$(oh-my-posh init bash --config $OHMYPOSH_CONFIG)"
+  unset OHMYPOSH_CONFIG
+fi

_home/dot_sz.shrc.d/bash.post/99_chezmoi.complete

@@ -1 +1 @@
-source <(chezmoi completion bash)
+[[ -n "$BASH_COMPLETION_EXIST" && -n $(type -fP chezmoi) ]] && source <(chezmoi completion bash)

_home/dot_sz.shrc.d/bash.post/99_gcloud.complete

@@ -1,4 +1,4 @@
 # The next line updates PATH for the Google Cloud SDK.
-if [ -f '/usr/lib/google-cloud-sdk/path.bash.inc' ]; then source '/usr/lib/google-cloud-sdk/path.bash.inc'; fi
-# The next line enables shell command completion for gcloud.
-if [ -f '/usr/lib/google-cloud-sdk/completion.bash.inc' ]; then source '/usr/lib/google-cloud-sdk/completion.bash.inc'; fi
+[[ -f '/usr/lib/google-cloud-sdk/path.bash.inc' ]] && source '/usr/lib/google-cloud-sdk/path.bash.inc'
+# The next line enables shell command completion for gcloud (as long as gcloud is IN the path).
+[[ -n "$(type -fP gcloud)" && -f '/usr/lib/google-cloud-sdk/completion.bash.inc' ]] && source '/usr/lib/google-cloud-sdk/completion.bash.inc'

_home/dot_sz.shrc.d/bash.post/99_pip.completion

@@ -1,2 +1,2 @@
-source <(pip completion --bash)
+[[ -n $(type -fP pip) ]] && source <(pip completion --bash)
 

_home/dot_sz.shrc.d/bash.post/99_terraform.complete

@@ -1,3 +1,4 @@
-if [ -r /usr/bin/terraform ]; then
-  complete -C /usr/bin/terraform terraform
+TERRAFORM_BIN=$(type -fP terraform | head -1)
+if [[ -n $TERRAFORM_BIN ]]; then
+  complete -C $TERRAFORM_BIN terraform
 fi

_home/dot_sz.shrc.d/bash.pre/10_check_completion

@@ -0,0 +1 @@
+[[ -x /usr/share/bash-completion/bash_completion ]] && BASH_COMPLETION_EXIST=1