dotfiles

commit 15048442a2d01c459b959e484f75f7a68e306df7 (patch)
parent 7b42d81348803af83df7200763422eff78c59f58
Author: Alexander Karle <akarle@umass.edu>
Date:   Tue, 29 May 2018 14:33:36 -0400

Small bash changes

1. another bug in bash completion sourcing
2. git status output is different on linux vs mac apparently

Diffstat:
M
bash/bash_prompt
 | 
3
++-
M
bash/bashrc
 | 
2
+-

2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/bash/bash_prompt b/bash/bash_prompt
@@ -13,7 +13,8 @@ if infocmp xterm-256color >/dev/null 2>&1; then
 fi
 
 function parse_git_dirty() {
-  [[ $(git status 2> /dev/null | tail -n1) != *"working directory clean"* ]] && echo "*"
+  [[ $(git status 2> /dev/null | tail -n1) != *"working directory clean"* ]] && \
+  [[ $(git status 2> /dev/null | tail -n1) != *"working tree clean"* ]] && echo "*"
 }
 
 function parse_git_branch() {
diff --git a/bash/bashrc b/bash/bashrc
@@ -30,4 +30,4 @@ shopt -s checkwinsize
 [ -f ~/.fzf.bash ] && source ~/.fzf.bash
 
 # Git Completion
-[ -f ~/.bash/git-completion.bash ] && source ~/.bash/.git-completion.bash
+[ -f ~/.bash/git-completion.bash ] && source ~/.bash/git-completion.bash