Merge pull request #1690 from NoahGorny/bash-it-version-improvement

Improve bash-it version output
pull/1694/head
Noah Gorny 2020-10-28 07:33:04 +02:00 committed by GitHub
commit e290af4eec
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 5 deletions

View File

@ -347,12 +347,22 @@ _bash-it-version() {
BASH_IT_GIT_REMOTE=$(git remote get-url $BASH_IT_REMOTE) BASH_IT_GIT_REMOTE=$(git remote get-url $BASH_IT_REMOTE)
BASH_IT_GIT_URL=${BASH_IT_GIT_REMOTE%.git} BASH_IT_GIT_URL=${BASH_IT_GIT_REMOTE%.git}
BASH_IT_GIT_VERSION_INFO="$(git log --pretty=format:'%h on %aI' -n 1)" current_tag=$(git describe --exact-match --tags 2> /dev/null)
BASH_IT_GIT_SHA=${BASH_IT_GIT_VERSION_INFO%% *}
echo "Current git SHA: $BASH_IT_GIT_VERSION_INFO" if [[ -z $current_tag ]]; then
echo "$BASH_IT_GIT_URL/commit/$BASH_IT_GIT_SHA" BASH_IT_GIT_VERSION_INFO="$(git log --pretty=format:'%h on %aI' -n 1)"
echo "Compare to latest: $BASH_IT_GIT_URL/compare/$BASH_IT_GIT_SHA...master" TARGET=${BASH_IT_GIT_VERSION_INFO%% *}
echo "Version type: dev"
echo "Current git SHA: $BASH_IT_GIT_VERSION_INFO"
echo "Commit info: $BASH_IT_GIT_URL/commit/$TARGET"
else
TARGET=$current_tag
echo "Version type: stable"
echo "Current tag: $current_tag"
echo "Tag information: $BASH_IT_GIT_URL/releases/tag/$current_tag"
fi
echo "Compare to latest: $BASH_IT_GIT_URL/compare/$TARGET...master"
cd - &> /dev/null || return cd - &> /dev/null || return
} }