From 199316f1a30950403ccab193f55f85241c0aa129 Mon Sep 17 00:00:00 2001 From: Johannes Altmanninger Date: Mon, 22 Sep 2025 17:09:13 +0200 Subject: [PATCH] build_tools/make_macos_pkg.sh: fix inconsistent version computation make_tarball.sh and others do it differently. (cherry picked from commit c771ff06d4385d4315e5ccf32b6993f6fb989fd8) --- build_tools/make_macos_pkg.sh | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/build_tools/make_macos_pkg.sh b/build_tools/make_macos_pkg.sh index 782e1e848..e2b869f3d 100755 --- a/build_tools/make_macos_pkg.sh +++ b/build_tools/make_macos_pkg.sh @@ -53,13 +53,7 @@ if [ -n "$NOTARIZE" ] && [ -z "$API_KEY_FILE" ]; then usage fi -VERSION=$(git describe --always --dirty 2>/dev/null) -if test -z "$VERSION" ; then - echo "Could not get version from git" - if test -f version; then - VERSION=$(cat version) - fi -fi +VERSION=$(build_tools/git_version_gen.sh --stdout 2>/dev/null) echo "Version is $VERSION"