Merge branch 'master' of github.com:HariSekhon/DevOps-Bash-tools

.bash.d/prompt.sh

@@ -99,7 +99,7 @@ if isMac; then
     if [[ "${PROMPT_COMMAND:-}" =~ update_terminal_cwd ]]; then
         # this unsets direnv's hook
         #unset PROMPT_COMMAND
-        PROMPT_COMMAND="${PROMPT_COMMAND//update_terminal_cwd/}"
+        PROMPT_COMMAND="${PROMPT_COMMAND//update_terminal_cwd;/}"
     fi
     # stripping update_terminal_cwd can leave some weird broken PROMPT_COMMAND start due to interaction with direnv, so strip it without forking to sed/perl
     while [[ "${PROMPT_COMMAND:-}" =~ ^[[:space:]]|^\; ]]; do

setup/brew-packages-desktop.txt

@@ -92,6 +92,7 @@ gradle-completion
 #groovysdk  # see near end
 hadolint
 haproxy
+helm
 htop
 hub
 #hugo  # static website generator - https://gohugo.io/getting-started/quick-start/
@@ -110,7 +111,6 @@ jython
 kompose
 #kubectl  # old version, download binary or use GCloud SDK version
 kubernetes-cli
-kubernetes-helm
 kustomize
 #lame  # mp3 encoder
 launchctl-completion