From f25be944879dc5ba59e29da975382a1d45030247 Mon Sep 17 00:00:00 2001
From: Nico Weber <thakis@chromium.org>
Date: Sat, 14 Aug 2021 18:50:52 -0400
Subject: [PATCH] LibCore: Make --version print same version as in LibGUI's
 About dialogs

Making every binary's behavior depend on the current git hash seems a
bit questionable to me, but we should be self-consistent about this.
---
 Userland/Libraries/LibCore/ArgsParser.cpp | 17 ++++++++++++++++-
 Userland/Libraries/LibCore/ArgsParser.h   |  1 +
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/Userland/Libraries/LibCore/ArgsParser.cpp b/Userland/Libraries/LibCore/ArgsParser.cpp
index 0c3d766f3d..28b9b53612 100644
--- a/Userland/Libraries/LibCore/ArgsParser.cpp
+++ b/Userland/Libraries/LibCore/ArgsParser.cpp
@@ -7,6 +7,7 @@
 #include <AK/Format.h>
 #include <AK/StringBuilder.h>
 #include <LibCore/ArgsParser.h>
+#include <LibCore/ConfigFile.h>
 #include <getopt.h>
 #include <limits.h>
 #include <math.h>
@@ -155,7 +156,7 @@ bool ArgsParser::parse(int argc, char* const* argv, FailureBehavior failure_beha
     // We're done parsing! :)
     // Now let's show version or help if requested.
     if (m_show_version) {
-        outln(stdout, "git");
+        print_version(stdout);
         if (failure_behavior == FailureBehavior::Exit || failure_behavior == FailureBehavior::PrintUsageAndExit)
             exit(0);
         return false;
@@ -241,6 +242,20 @@ void ArgsParser::print_usage(FILE* file, const char* argv0)
     }
 }
 
+void ArgsParser::print_version(FILE* file)
+{
+    auto version_config = Core::ConfigFile::open("/res/version.ini");
+    auto major_version = version_config->read_entry("Version", "Major", "0");
+    auto minor_version = version_config->read_entry("Version", "Minor", "0");
+
+    StringBuilder builder;
+    builder.appendff("{}.{}", major_version, minor_version);
+    if (auto git_version = version_config->read_entry("Version", "Git", ""); git_version != "")
+        builder.appendff(".g{}", git_version);
+
+    outln(file, builder.to_string());
+}
+
 void ArgsParser::add_option(Option&& option)
 {
     m_options.append(move(option));
diff --git a/Userland/Libraries/LibCore/ArgsParser.h b/Userland/Libraries/LibCore/ArgsParser.h
index fdb1e0612f..f7105e81f5 100644
--- a/Userland/Libraries/LibCore/ArgsParser.h
+++ b/Userland/Libraries/LibCore/ArgsParser.h
@@ -58,6 +58,7 @@ public:
     void set_general_help(const char* help_string) { m_general_help = help_string; };
     void set_stop_on_first_non_option(bool stop_on_first_non_option) { m_stop_on_first_non_option = stop_on_first_non_option; }
     void print_usage(FILE*, const char* argv0);
+    void print_version(FILE*);
 
     void add_option(Option&&);
     void add_option(bool& value, const char* help_string, const char* long_name, char short_name);