explicitly source bash completion and ignore powerline for vscode

pull/1/head
Andrew Coleman 2018-11-05 16:09:02 -05:00
parent dd44b3fc45
commit c85848e78d
1 changed files with 2 additions and 1 deletions

View File

@ -1,4 +1,5 @@
test -f /etc/bashrc && . /etc/bashrc || true test -f /etc/bashrc && . /etc/bashrc || true
test -f /etc/bash_completion && . /etc/bash_completion || true
test -f $HOME/.bash_aliases && . $HOME/.bash_aliases || true test -f $HOME/.bash_aliases && . $HOME/.bash_aliases || true
#export AWS_ACCESS_KEY_ID= #export AWS_ACCESS_KEY_ID=
@ -29,7 +30,7 @@ for k in $HOME/bin/*.bash ; do . $k ; done
function _update_ps1() { function _update_ps1() {
PS1="$(powerline-go -error $?)" PS1="$(powerline-go -error $?)"
} }
if [[ $(which powerline-go 2>/dev/null) && "$TERM" != "linux" ]]; then if [[ $(which powerline-go 2>/dev/null) && "$TERM" != "linux" && "$TERM_PROGRAM" != "vscode" ]]; then
PROMPT_COMMAND="_update_ps1; $PROMPT_COMMAND" PROMPT_COMMAND="_update_ps1; $PROMPT_COMMAND"
else else
PS1='[\[\033[01;32m\]\u@\h\[\033[00m\] \[\033[01;34m\]\w$(__git_ps1 " (%s)")\[\033[00m\]]\$ ' PS1='[\[\033[01;32m\]\u@\h\[\033[00m\] \[\033[01;34m\]\w$(__git_ps1 " (%s)")\[\033[00m\]]\$ '