pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2025-12-14 03:11:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix command exit codes

Browse Source
This commit is contained in:
Akkadius 2020-07-07 02:09:39 -05:00
parent a54d92d078
commit 084e9b7a35
2 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
common/cli/eqemu_command_handler.cpp
View File

@ -77,7 +77,7 @@ namespace EQEmuCommand {
index++; index++;
} }
if (!arguments_filled || argc == 2) { if (!arguments_filled || argc == 2 || cmd[{"-h", "--help"}]) {
std::string arguments_string; std::string arguments_string;
for (auto &arg : arguments) { for (auto &arg : arguments) {
arguments_string += " " + arg; arguments_string += " " + arg;
@ -101,7 +101,7 @@ namespace EQEmuCommand {
std::cout << command_string.str() << std::endl; std::cout << command_string.str() << std::endl;
exit(1); exit(0);
} }
} }
@ -188,11 +188,11 @@ namespace EQEmuCommand {
std::cout << std::endl; std::cout << std::endl;
std::exit(1); std::exit(0);
} }
if (ran_command) { if (ran_command) {
std::exit(1); std::exit(0);
} }
} }

6
world/world_server_command_handler.cpp
View File

@ -223,10 +223,6 @@ namespace WorldserverCommandHandler {
{ {
description = "Dumps server database tables"; description = "Dumps server database tables";
if (cmd[{"-h", "--help"}]) {
return;
}
std::vector<std::string> arguments = {}; std::vector<std::string> arguments = {};
std::vector<std::string> options = { std::vector<std::string> options = {
"--all", "--all",
@ -245,7 +241,7 @@ namespace WorldserverCommandHandler {
}; };
if (argc < 3) { if (argc < 3 || cmd[{"-h", "--help"}]) {
EQEmuCommand::ValidateCmdInput(arguments, options, cmd, argc, argv); EQEmuCommand::ValidateCmdInput(arguments, options, cmd, argc, argv);
return; return;
} }