diff --git a/bash.bashrc b/bash.bashrc index 0cd2c86..e39e19f 100644 --- a/bash.bashrc +++ b/bash.bashrc @@ -107,14 +107,15 @@ __prompt_command() { local branch=$(git branch 2> /dev/null | grep -e ^* | cut -d ' ' -f2) PS1+=" ${R}[${Mag}${branch}${R}|" - local tag_release=`git describe --exact-match --tags $(git log -n1 --pretty='%h') 2> /dev/null` + #local tag_release=`git describe --exact-match --tags $(git log -n1 --pretty='%h') 2> /dev/null` + local tag_release=$(git describe --tags | cut -d'-' -f1) local dirty=$(git status -s | wc -l) if [[ $dirty -ne 0 ]]; then PS1+="${Mag}⚡|${tag_release}…$dirty" else local ahead=$(git rev-list --branches --not --remotes |wc -l) if [[ $ahead -ne 0 ]]; then - PS1+="${Blu}⚡|${tag_release}↑${ahead}" + PS1+="${Blu}⚡${R}|${Blu}${tag_release}↑${ahead}" else if [[ -z $tag_release ]];then PS1+="${Red}✔"