dotfiles.git

@@ -4,20 +4,22 @@ if [[ $(uname -s) != Darwin* ]] && [ -f /etc/bashrc ]; then

     . /etc/bashrc

 fi

-parse_git_branch() {

+# Some devices may not have __git_ps1, so fake it

+if ! $(declare -F __git_ps1 > /dev/null); then

+    __git_ps1() {

         git branch 2> /dev/null | sed -e '/^[^*]/d' -e 's/* \(.*\)/ ⌥\1/'

-    #git branch 2> /dev/null | sed -e '/^[^*]/d' -e 's/* \(.*\)/ \1/'

     }

+fi

 if true ; then

     export PROMPT_DIRTRIM=1

     # I like 023 or 030 for the git branch color. See https://i.stack.imgur.com/UQVe5.png

     if [[ -n $SSH_CLIENT ]]; then

         export PS1='$(if [ $? -eq 0 ]; then echo -e "\[\e[32m\]\xe2\x9c\x93";

-                      else echo -e "\[\e[31m\]\xe2\x9c\x97"; fi) \[\e[38;5;242m\]\h:\w\[\e[38;5;030m\]$(parse_git_branch)\[\e[38;5;242m\]$\[\e[0m\] '

+                      else echo -e "\[\e[31m\]\xe2\x9c\x97"; fi) \[\e[38;5;242m\]\h:\w\[\e[38;5;030m\]$(__git_ps1 " ⌥%s")\[\e[38;5;242m\]$\[\e[0m\] '

     else

         export PS1='$(if [ $? -eq 0 ]; then echo -e "\[\e[32m\]\xe2\x9c\x93";

-                      else echo -e "\[\e[31m\]\xe2\x9c\x97"; fi) \[\e[38;5;242m\]\w\[\e[38;5;030m\]$(parse_git_branch)\[\e[38;5;242m\]$\[\e[0m\] '

+                      else echo -e "\[\e[31m\]\xe2\x9c\x97"; fi) \[\e[38;5;242m\]\w\[\e[38;5;030m\]$(__git_ps1 " ⌥%s")\[\e[38;5;242m\]$\[\e[0m\] '

     fi

 else

     export PROMPT_DIRTRIM=4