From 3398d76b591fc57143d6cbde22ecfd5ed6348baf Mon Sep 17 00:00:00 2001
From: Willy-JL <49810075+Willy-JL@users.noreply.github.com>
Date: Thu, 20 Jul 2023 02:40:28 +0100
Subject: [PATCH] Fix build

---
 scripts/fbt_tools/fbt_version.py |  2 +-
 scripts/version.py               | 14 +++++++++++---
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/scripts/fbt_tools/fbt_version.py b/scripts/fbt_tools/fbt_version.py
index aead13b29..1bd86f1f1 100644
--- a/scripts/fbt_tools/fbt_version.py
+++ b/scripts/fbt_tools/fbt_version.py
@@ -21,7 +21,7 @@ def generate(env):
                 action=Action(
                     '${PYTHON3} "${VERSION_SCRIPT}" generate '
                     "-t ${TARGET_HW} -fw-origin ${FIRMWARE_ORIGIN} "
-                    '-o ${TARGET.dir.posix} --dir "${ROOT_DIR}"',
+                    '-o ${TARGET.dir.posix} --dir "${ROOT_DIR}" --suffix "${DIST_SUFFIX}"',
                     "${VERSIONCOMSTR}",
                 ),
                 emitter=version_emitter,
diff --git a/scripts/version.py b/scripts/version.py
index 8ea4ff1a0..f33c5e6e9 100755
--- a/scripts/version.py
+++ b/scripts/version.py
@@ -10,8 +10,9 @@ from flipper.app import App
 class GitVersion:
     REVISION_SUFFIX_LENGTH = 8
 
-    def __init__(self, source_dir):
+    def __init__(self, source_dir, suffix):
         self.source_dir = source_dir
+        self.suffix = suffix
 
     def get_version_info(self):
         commit = (
@@ -34,7 +35,11 @@ class GitVersion:
             or "unknown"
         )
 
-        version = os.environ.get("DIST_SUFFIX", None).split("_")[0] or "unknown"
+        version = (
+            self.suffix.split("_")[0]
+            or os.environ.get("DIST_SUFFIX", None)
+            or "unknown"
+        )
 
         force_no_dirty = os.environ.get("FORCE_NO_DIRTY", None) or ""
         if force_no_dirty != "":
@@ -103,10 +108,13 @@ class Main(App):
             required=True,
         )
         self.parser_generate.add_argument("--dir", dest="sourcedir", required=True)
+        self.parser_generate.add_argument("--suffix", dest="suffix", required=True)
         self.parser_generate.set_defaults(func=self.generate)
 
     def generate(self):
-        current_info = GitVersion(self.args.sourcedir).get_version_info()
+        current_info = GitVersion(
+            self.args.sourcedir, self.args.suffix
+        ).get_version_info()
 
         build_date = (
             date.today()