From 38bb189772d90e39ed7d85a0cf89dbc3a532c34e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?kleines=20Filmr=C3=B6llchen?= Date: Tue, 30 Aug 2022 12:47:44 +0200 Subject: [PATCH] LibCore: Read version information from uname() instead of /res/version --- Userland/Libraries/LibCore/Version.cpp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/Userland/Libraries/LibCore/Version.cpp b/Userland/Libraries/LibCore/Version.cpp index 8a162e9d653..b5a95b8e19d 100644 --- a/Userland/Libraries/LibCore/Version.cpp +++ b/Userland/Libraries/LibCore/Version.cpp @@ -4,22 +4,22 @@ * SPDX-License-Identifier: BSD-2-Clause */ -#include +#include +#include #include namespace Core::Version { String read_long_version_string() { - auto version_config = Core::ConfigFile::open("/res/version.ini").release_value_but_fixme_should_propagate_errors(); - auto major_version = version_config->read_entry("Version", "Major", "0"); - auto minor_version = version_config->read_entry("Version", "Minor", "0"); + auto result = Core::System::uname(); + if (result.is_error()) + return {}; - StringBuilder builder; - builder.appendff("Version {}.{}", major_version, minor_version); - if (auto git_version = version_config->read_entry("Version", "Git", ""); git_version != "") - builder.appendff(".g{}", git_version); - return builder.to_string(); + auto version = result.value().release; + auto git_hash = result.value().version; + + return String::formatted("Version {} revision {}", version, git_hash); } }