diff options
| author | Daniel Eklöf <daniel@ekloef.se> | 2021-06-25 06:33:42 +0000 |
|---|---|---|
| committer | Daniel Eklöf <daniel@ekloef.se> | 2021-06-25 06:35:41 +0000 |
| commit | bc6b4d7b8ab8bee7a5c50c2eeba8fd939487042b (patch) | |
| tree | 2fa2ebffdae12f558a3e6de0a2830978cb839e9a /generate-version.sh | |
| parent | meson/pkgbuild: bump version to 1.8.0 (diff) | |
generate-version: fix regression where a tagged version was parsed wrong1.8.0
The regexps didn’t work when the “extra” portion of “git describe” was
missing.
Diffstat (limited to 'generate-version.sh')
| -rwxr-xr-x | generate-version.sh | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/generate-version.sh b/generate-version.sh index b539ce42..e088170b 100755 --- a/generate-version.sh +++ b/generate-version.sh @@ -20,12 +20,13 @@ if [ -d "${src_dir}/.git" ] && command -v git > /dev/null; then new_version="${git_version} ($(env LC_TIME=C date "+%b %d %Y"), branch '${git_branch}')" else new_version="${default_version}" + extra="" fi -major=$(echo "${new_version}" | sed -r 's/([0-9]+)\.([0-9]+)\.([0-9]+)(-([0-9]+-g[a-z0-9]+) .*)?/\1/') -minor=$(echo "${new_version}" | sed -r 's/([0-9]+)\.([0-9]+)\.([0-9]+)(-([0-9]+-g[a-z0-9]+) .*)?/\2/') -patch=$(echo "${new_version}" | sed -r 's/([0-9]+)\.([0-9]+)\.([0-9]+)(-([0-9]+-g[a-z0-9]+) .*)?/\3/') -extra=$(echo "${new_version}" | sed -r 's/([0-9]+)\.([0-9]+)\.([0-9]+)(-([0-9]+-g[a-z0-9]+) .*)?/\5/') +major=$(echo "${new_version}" | sed -r 's/([0-9]+)\.([0-9]+)\.([0-9]+).*/\1/') +minor=$(echo "${new_version}" | sed -r 's/([0-9]+)\.([0-9]+)\.([0-9]+).*/\2/') +patch=$(echo "${new_version}" | sed -r 's/([0-9]+)\.([0-9]+)\.([0-9]+).*/\3/') +extra=$(echo "${new_version}" | sed -r 's/([0-9]+)\.([0-9]+)\.([0-9]+)(-([0-9]+-g[a-z0-9]+) .*)?.*/\5/') new_version="#define FOOT_VERSION \"${new_version}\" #define FOOT_MAJOR ${major} |
