Git-Mirrors/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2025-08-19 02:07:54 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #3640

Browse source 
f36132a wallet cli/rpc: terminate execution with code 0 when --help or --version is given (stoffu)
This commit is contained in:
luigi1111 2018-05-31 14:44:54 -05:00
commit 503d2693fd
No known key found for this signature in database
GPG key ID: F4ACA0183641E010
5 changed files with 36 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/simplewallet/simplewallet.cpp
View file

@ -7524,7 +7524,9 @@ int main(int argc, char* argv[])
po::positional_options_description positional_options;
positional_options.add(arg_command.name, -1);
const auto vm = wallet_args::main(
boost::optional<po::variables_map> vm;
bool should_terminate = false;
std::tie(vm, should_terminate) = wallet_args::main(
argc, argv,
"monero-wallet-cli [--wallet-file=<file>|--generate-new-wallet=<file>] [<COMMAND>]",
sw::tr("This is the command line monero wallet. It needs to connect to a monero\ndaemon to work correctly.\nWARNING: Do not reuse your Monero keys on an another fork, UNLESS this fork has key reuse mitigations built in. Doing so will harm your privacy."),
@ -7539,6 +7541,11 @@ int main(int argc, char* argv[])
return 1;
}
if (should_terminate)
{
return 0;
}
cryptonote::simple_wallet w;
const bool r = w.init(*vm);
CHECK_AND_ASSERT_MES(r, 1, sw::tr("Failed to initialize wallet"));