Automatic merge of trunk into multilib

This commit is contained in:
Thomas Trepl (Moody) 2021-05-06 05:45:09 +02:00
commit bfee8ec9c9

View File

@ -30,7 +30,7 @@ esac
full_date="$month $day$suffix, $year" full_date="$month $day$suffix, $year"
sha="$(git describe --abbrev=1)" sha="$(git describe --abbrev=1)"
if git describe --all --match trunk > /dev/null 2> /dev/null; then if [ "$(git branch --show-current)" = "trunk" ]; then
sha=$(echo "$sha" | sed 's/-g[^-]*$//') sha=$(echo "$sha" | sed 's/-g[^-]*$//')
fi fi
version="$sha" version="$sha"