From e5aceaaff1b924f5838eea80c85b717e7d9281bf Mon Sep 17 00:00:00 2001
From: Aditya Ramani <a_ramani@apple.com>
Date: Thu, 5 Jun 2025 09:10:16 -0700
Subject: [PATCH] Cleanup output from `--version` (#16)

The output now looks like the following

#### When build against a tagged HEAD in `RELEASE` mode
```
container --version
container CLI version 0.0.2 (build: release, commit: ed4a4cb)
```
---
 Sources/CLI/Application.swift | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/Sources/CLI/Application.swift b/Sources/CLI/Application.swift
index f2633d8f..1f012b41 100644
--- a/Sources/CLI/Application.swift
+++ b/Sources/CLI/Application.swift
@@ -279,18 +279,26 @@ extension Application {
     }
 
     private static func releaseVersion() -> String {
-        var extras = "release"
+        var versionDetails: [String: String] = ["build": "release"]
         #if DEBUG
-        extras = "debug"
+        versionDetails["build"] = "debug"
         #endif
         #if CURRENT_SDK
-        extras += " MacOS 15 SDK"
+        versionDetails["sdk"] = "MacOS 15"
         #endif
+        let gitCommit = {
+            let sha = get_git_commit().map { String(cString: $0) }
+            guard let sha else {
+                return "unspecified"
+            }
+            return String(sha.prefix(7))
+        }()
+        versionDetails["commit"] = gitCommit
+        let extras: String = versionDetails.map { "\($0): \($1)" }.sorted().joined(separator: ", ")
 
         let bundleVersion = (Bundle.main.infoDictionary?["CFBundleShortVersionString"] as? String)
         let releaseVersion = bundleVersion ?? get_release_version().map { String(cString: $0) } ?? "0.0.0"
-        let scVersion = get_swift_containerization_version().map { String(cString: $0) } ?? "0.0.0"
-        let gitCommit = get_git_commit().map { String(cString: $0) } ?? "unspecified"
-        return "app \(releaseVersion) commit \(gitCommit) containerization \(scVersion) \(extras)"
+
+        return "container CLI version \(releaseVersion) (\(extras))"
     }
 }