fix docker completion & prompt

1 files changed, 37 insertions, 31 deletions

diff --git a/bash/.bashrc b/bash/.bashrc
index 01e5e04..ffef555 100644
--- a/bash/.bashrc
+++ b/bash/.bashrc
@@ -1,7 +1,7 @@
 LC_ALL="en_US.UTF-8"
 # This PS1 is completed at the end, allowing statuses to be included between the directory and closing $
 PS1="[\u@\[\e[38;5;148m\]\h\[\e[m\]:\[\e[36m\]\W\[\e[m\]\[\e[m\]]\[\e[m\]"
-local END_PS1="\$\[\e[m\] "
+END_PS1="\$\[\e[m\] "
 # This is the original PS1
 #PS1="[\u@\[\e[38;5;148m\]\h\[\e[m\]:\[\e[36m\]\W\[\e[m\]\[\e[m\]]\[\e[m\]\$\[\e[m\] "
 PATH="${HOME}/bin:${HOME}/.local/bin:${PATH}"
@@ -54,8 +54,13 @@ fi
 
 # Enable docker completions
 if [ -d /Applications/Docker.app/Contents/Resources/etc/ ]; then
+    # Docker for Mac seems to switch the filenames sometimes.
+    if [ -f /Applications/Docker.app/Contents/Resources/etc/docker ]; then
+        . /Applications/Docker.app/Contents/Resources/etc/docker
+    elif [ -f /Applications/Docker.app/Contents/Resources/etc/docker-compose.bash-completion ]; then
+        . /Applications/Docker.app/Contents/Resources/etc/docker-compose.bash-completion
+    fi
     . /Applications/Docker.app/Contents/Resources/etc/docker-compose.bash-completion
-    . /Applications/Docker.app/Contents/Resources/etc/docker
 fi
 
 # Enable nix
@@ -159,6 +164,19 @@ alias define='sdcv'
 #alias cleanstale="git clean -fd -e'!__pycache__' -e'!*.py[cod]'"
 #alias dry-cleanstale="git clean -fdn -e'!__pycache__' -e'!*.py[cod]'"
 
+# Enable direnv (https://github.com/direnv/direnv/)
+DIRENV=`which direnv`
+if [[ -x $DIRENV ]]; then
+    eval "$(direnv hook bash)"
+fi
+show_virtual_env() {
+  if [[ -n "$VIRTUAL_ENV" && -n "$DIRENV_DIR" ]]; then
+    echo "($(basename $VIRTUAL_ENV))"
+  fi
+}
+export -f show_virtual_env
+PS1='$(show_virtual_env)'$PS1
+
 # Git Related
 function delete-branches() {
     # Interactive branch deleter
@@ -169,31 +187,18 @@ function delete-branches() {
         xargs --no-run-if-empty git branch --delete --force
 }
 
-local XCODE_SELECT=`which xcode-select`
+XCODE_SELECT=`which xcode-select`
 if [[ -x $XCODE_SELECT ]]; then
-    local OSX_GIT_COMPLETION=`xcode-select -p`/usr/share/git-core/git-completion.bash
+    OSX_GIT_COMPLETION=`xcode-select -p`/usr/share/git-core/git-completion.bash
     if [[ -f $OSX_GIT_COMPLETION ]]; then
         source $OSX_GIT_COMPLETION
     fi
-    local OSX_GIT_PROMPT=`xcode-select -p`/usr/share/git-core/git-prompt.sh
+    OSX_GIT_PROMPT=`xcode-select -p`/usr/share/git-core/git-prompt.sh
     if [[ -f $OSX_GIT_PROMPT ]]; then
         source $OSX_GIT_PROMPT
     fi
 fi
 
-if [[ $(type -t __git_ps1) == function ]]; then
-    GIT_PS1_SHOWDIRTYSTATE=1  # Show unstaged and staged indicators
-    GIT_PS1_SHOWUNTRACKEDFILES=1  # show % for untracked files
-    # GIT_PS1_SHOWUPSTREAM=auto  # show +/- changes with upstream
-    #PS1=$PS1'$(__git_ps1 " (%s)")'
-
-    # Alternatively, for a slightly faster prompt, __git_ps1 can  be
-    # used for PROMPT_COMMAND in Bash with two parameters, <pre> and
-    # <post>, which are strings you would put in $PS1 before and after
-    # the status string generated by the git-prompt machinery.
-    export PROMPT_COMMAND="__git_ps1 '${PS1}' '${END_PS1}'; ${PROMPT_COMMAND}"
-fi
-
 # The Gemini earbuds don't sync the volume. This turns up the hardware volume control
 alias geminiup="dbus-send --print-reply --system --dest=org.bluez /org/bluez/hci0/dev_7C_C4_EF_CC_45_43 org.bluez.MediaControl1.VolumeUp"
 alias geminidown="dbus-send --print-reply --system --dest=org.bluez /org/bluez/hci0/dev_7C_C4_EF_CC_45_43 org.bluez.MediaControl1.VolumeDown"
@@ -205,19 +210,6 @@ export MOZ_USE_XINPUT2=1
 #export GPG_TTY=$(tty)
 export SSH_AUTH_SOCK="$(gpgconf --list-dirs agent-ssh-socket)"
 
-# Enable direnv (https://github.com/direnv/direnv/)
-DIRENV=`which direnv`
-if [[ -x $DIRENV ]]; then
-    eval "$(direnv hook bash)"
-fi
-show_virtual_env() {
-  if [[ -n "$VIRTUAL_ENV" && -n "$DIRENV_DIR" ]]; then
-    echo "($(basename $VIRTUAL_ENV))"
-  fi
-}
-export -f show_virtual_env
-PS1='$(show_virtual_env)'$PS1
-
 # Enable warpdir (https://rc4.net/wd-rs/)
 WARPDIR=`which warpdir`
 if [[ -x $WARPDIR ]]; then
@@ -230,5 +222,19 @@ if [[ -x $TERRAFORM ]]; then
     complete -C $TERRAFORM terraform
 fi
 
+# If __git_ps1 is enabled, set that up.
+if [[ $(type -t __git_ps1) == function ]]; then
+    GIT_PS1_SHOWDIRTYSTATE=1  # Show unstaged and staged indicators
+    GIT_PS1_SHOWUNTRACKEDFILES=1  # show % for untracked files
+    # GIT_PS1_SHOWUPSTREAM=auto  # show +/- changes with upstream
+    PS1=$PS1'$(__git_ps1 " (%s)")'
+
+    # Alternatively, for a slightly faster prompt, __git_ps1 can  be
+    # used for PROMPT_COMMAND in Bash with two parameters, <pre> and
+    # <post>, which are strings you would put in $PS1 before and after
+    # the status string generated by the git-prompt machinery.
+    # DISABLED because this doesn't work with $(show_virtualenv)
+    #export PROMPT_COMMAND="__git_ps1 '${PS1}' '${END_PS1}'; ${PROMPT_COMMAND}"
+fi
 # Close off the PS1 with the $
 PS1=${PS1}${END_PS1}