From: Jan Janssen <medhefgo@web.de>
Date: Mon, 28 Aug 2023 17:18:37 +0000 (+0200)
Subject: meson: Fix version script
X-Git-Tag: v255-rc1~625
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=29c2f6ac4ba11501a09bec79774fe4abdd5a5ade;p=thirdparty%2Fsystemd.git

meson: Fix version script

Apparently, the `|` has a higher priority…
---

diff --git a/meson.build b/meson.build
index 910e06c7834..6d0cddf7d8c 100644
--- a/meson.build
+++ b/meson.build
@@ -1813,8 +1813,8 @@ version_tag = get_option('version-tag')
 if version_tag == '' and git.found() and fs.exists(project_source_root / '.git')
         # If the working tree has no tags (CI builds), the first git-describe will fail
         # and we fall back to project_version-commitid instead.
-        version_cmd = '''git -C "$1" describe --abbrev=7 --dirty=^ 2>/dev/null ||
-                         echo "$2-$(git -C "$1" describe --always --abbrev=7)" |
+        version_cmd = '''(git -C "$1" describe --abbrev=7 --dirty=^ 2>/dev/null ||
+                          echo "$2-$(git -C "$1" describe --always --abbrev=7)") |
                          sed 's/^v//; s/-rc/~rc/' '''
 else
         version_cmd = '''echo "$2" '''