From 9d82ae97ae5cf5730b6ed71a5e1470285e75474c Mon Sep 17 00:00:00 2001 From: SAS2000 Date: Thu, 21 Aug 2025 19:13:04 +0200 Subject: [PATCH] fix(SERVER/Main): Implementation for version param (#22707) --- src/server/apps/authserver/Main.cpp | 9 ++++----- src/server/apps/worldserver/Main.cpp | 8 +++----- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/src/server/apps/authserver/Main.cpp b/src/server/apps/authserver/Main.cpp index e9ed0119f..b5fbb319a 100644 --- a/src/server/apps/authserver/Main.cpp +++ b/src/server/apps/authserver/Main.cpp @@ -29,6 +29,7 @@ #include "Config.h" #include "DatabaseEnv.h" #include "DatabaseLoader.h" +#include "GitRevision.h" #include "IPLocation.h" #include "IoContext.h" #include "Log.h" @@ -75,7 +76,7 @@ int main(int argc, char** argv) auto vm = GetConsoleArguments(argc, argv, configFile); // exit if help or version is enabled - if (vm.count("help")) + if (vm.count("help") || vm.count("version")) return 0; // Add file and args in config @@ -292,13 +293,11 @@ variables_map GetConsoleArguments(int argc, char** argv, fs::path& configFile) } if (variablesMap.count("help")) - { std::cout << all << "\n"; - } + else if (variablesMap.count("version")) + std::cout << GitRevision::GetFullVersion() << "\n"; else if (variablesMap.count("dry-run")) - { sConfigMgr->setDryRun(true); - } return variablesMap; } diff --git a/src/server/apps/worldserver/Main.cpp b/src/server/apps/worldserver/Main.cpp index 26a13985f..bdc2f860f 100644 --- a/src/server/apps/worldserver/Main.cpp +++ b/src/server/apps/worldserver/Main.cpp @@ -127,7 +127,7 @@ int main(int argc, char** argv) auto vm = GetConsoleArguments(argc, argv, configFile, configService); // exit if help or version is enabled - if (vm.count("help")) + if (vm.count("help") || vm.count("version")) return 0; #if AC_PLATFORM == AC_PLATFORM_WINDOWS @@ -733,13 +733,11 @@ variables_map GetConsoleArguments(int argc, char** argv, fs::path& configFile, [ } if (vm.count("help")) - { std::cout << all << "\n"; - } + else if (vm.count("version")) + std::cout << GitRevision::GetFullVersion() << "\n"; else if (vm.count("dry-run")) - { sConfigMgr->setDryRun(true); - } return vm; }