Fix command exit codes

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

View File

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

View File

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