From 92d8a4c55675e1ec1e61425e796ea75f8f7fae42 Mon Sep 17 00:00:00 2001
From: Alex Pyrgiotis <alex.p@freedom.press>
Date: Tue, 14 Jan 2025 23:49:43 +0200
Subject: [PATCH] FIXUP: Improve readability

---
 install/common/build-image.py | 48 +++++++++++++++++------------------
 1 file changed, 24 insertions(+), 24 deletions(-)

diff --git a/install/common/build-image.py b/install/common/build-image.py
index cca9b5f..0232813 100644
--- a/install/common/build-image.py
+++ b/install/common/build-image.py
@@ -27,6 +27,29 @@ def str2bool(v):
         raise argparse.ArgumentTypeError("Boolean value expected.")
 
 
+def determine_tag():
+    # Designate a unique tag for this image, depending on the Git commit it was created
+    # from:
+    # 1. If created from a Git tag (e.g., 0.8.0), the image tag will be `0.8.0`.
+    # 2. If created from a commit, it will be something like `0.8.0-31-g6bdaa7a`.
+    # 3. If the contents of the Git repo are dirty, we will append a unique identifier
+    #    for this run, something like `0.8.0-31-g6bdaa7a-fdcb` or `0.8.0-fdcb`.
+    dirty_ident = secrets.token_hex(2)
+    return (
+        subprocess.check_output(
+            [
+                "git",
+                "describe",
+                "--long",
+                "--first-parent",
+                f"--dirty=-{dirty_ident}",
+            ],
+        )
+        .decode()
+        .strip()[1:]  # remove the "v" prefix of the tag.
+    )
+
+
 def main():
     parser = argparse.ArgumentParser()
     parser.add_argument(
@@ -67,30 +90,7 @@ def main():
 
     print(f"Building for architecture '{ARCH}'")
 
-    if args.tag:
-        tag = args.tag
-    else:
-        # Designate a unique tag for this image, depending on the Git commit it was created
-        # from:
-        # 1. If created from a Git tag (e.g., 0.8.0), the image tag will be `0.8.0`.
-        # 2. If created from a commit, it will be something like `0.8.0-31-g6bdaa7a`.
-        # 3. If the contents of the Git repo are dirty, we will append a unique identifier
-        #    for this run, something like `0.8.0-31-g6bdaa7a-fdcb` or `0.8.0-fdcb`.
-        dirty_ident = secrets.token_hex(2)
-        tag = (
-            subprocess.check_output(
-                [
-                    "git",
-                    "describe",
-                    "--long",
-                    "--first-parent",
-                    f"--dirty=-{dirty_ident}",
-                ],
-            )
-            .decode()
-            .strip()[1:]  # remove the "v" prefix of the tag.
-        )
-
+    tag = args.tag or determine_tag()
     image_name_tagged = IMAGE_NAME + ":" + tag
 
     print(f"Will tag the container image as '{image_name_tagged}'")