Ported: Command line arguments '--version' and '--help' return exit code 0 instead of 255

Allows to detect whether those commands executed successfully, which makes integration with shell scripts/CI/bindings straightforward. - Bromeon
da78e92321
This commit is contained in:
Relintai 2022-07-29 21:35:41 +02:00
parent 01b1c3e99f
commit d10acf7390

View File

@ -470,6 +470,9 @@ Error Main::setup(const char *execpath, int argc, char *argv[], bool p_second_ph
packed_data->add_pack_source(zip_packed_data);
#endif
// Default exit code, can be modified for certain errors.
Error exit_code = ERR_INVALID_PARAMETER;
I = args.front();
while (I) {
#ifdef OSX_ENABLED
@ -486,10 +489,12 @@ Error Main::setup(const char *execpath, int argc, char *argv[], bool p_second_ph
if (I->get() == "-h" || I->get() == "--help" || I->get() == "/?") { // display help
show_help = true;
exit_code = OK;
goto error;
} else if (I->get() == "--version") {
print_line(get_full_version_string());
exit_code = OK;
goto error;
} else if (I->get() == "-v" || I->get() == "--verbose") { // verbose output
@ -1302,7 +1307,7 @@ error:
OS::get_singleton()->finalize_core();
locale = String();
return ERR_INVALID_PARAMETER;
return exit_code;
}
Error Main::setup2(Thread::ID p_main_tid_override) {