From 2b6a34dc5cb131be5bd7ba17be5c1cfa13baf7d4 Mon Sep 17 00:00:00 2001 From: ed Date: Mon, 18 Mar 2024 17:04:49 +0000 Subject: [PATCH] sfx: lexically comparable git-build versions if building from an untagged git commit, the third value in the VERSION tuple (in __version__.py) was a string instead of an int, causing the version to compare and sort incorrectly --- scripts/make-sfx.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/make-sfx.sh b/scripts/make-sfx.sh index df9cff2d..dd9b817d 100755 --- a/scripts/make-sfx.sh +++ b/scripts/make-sfx.sh @@ -368,7 +368,7 @@ git describe --tags >/dev/null 2>/dev/null && { printf '%s\n' "$git_ver" | grep -qE '^v[0-9\.]+-[0-9]+-g[0-9a-f]+$' && { # long format (unreleased commit) - t_ver="$(printf '%s\n' "$ver" | sed -r 's/\./, /g; s/(.*) (.*)/\1 "\2"/')" + t_ver="$(printf '%s\n' "$ver" | sed -r 's/[-.]/, /g; s/(.*) (.*)/\1 "\2"/')" } [ -z "$t_ver" ] && {