XorA
/
bash-it
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Undo my change to git command usage (the test) 

This reverts commit 12e225afef.

Didn't realise when in '.git', it will return `0` but still show
`false`; git(1) is quite finicky, somtimes.
pull/1840/head
terminalforlife 2021-02-17 22:57:20 +00:00
parent 0a420e7010
commit 6662cadfe8
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
themes/base.theme.bash
View File

@ -104,7 +104,7 @@ function scm {
SCM=$SCM_NONE SCM=$SCM_NONE
elif [[ -f .git/HEAD ]] && [[ -x "$GIT_EXE" ]]; then elif [[ -f .git/HEAD ]] && [[ -x "$GIT_EXE" ]]; then
SCM=$SCM_GIT SCM=$SCM_GIT
elif [[ -x "$GIT_EXE" ]] && git rev-parse --is-inside-work-tree &> /dev/null; then elif [[ -x "$GIT_EXE" ]] && [[ -n "$(git rev-parse --is-inside-work-tree 2> /dev/null)" ]]; then
SCM=$SCM_GIT SCM=$SCM_GIT
elif [[ -x "$P4_EXE" ]] && [[ -n "$(p4 set P4CLIENT 2> /dev/null)" ]]; then elif [[ -x "$P4_EXE" ]] && [[ -n "$(p4 set P4CLIENT 2> /dev/null)" ]]; then
SCM=$SCM_P4 SCM=$SCM_P4
@ -181,8 +181,10 @@ function scm_prompt_info_common {
} }
function terraform_workspace_prompt { function terraform_workspace_prompt {
if _command_exists terraform && [ -d .terraform ]; then if _command_exists terraform; then
echo -e "$(terraform workspace show 2> /dev/null)" if [ -d .terraform ]; then
echo -e "$(terraform workspace show 2> /dev/null)"
fi
fi fi
} }