Git-Mirrors/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2025-08-09 14:42:50 -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

8
src/wallet/wallet_rpc_server.cpp
View file

@ -2901,7 +2901,9 @@ int main(int argc, char** argv) {
command_line::add_arg(desc_params, arg_wallet_dir);
command_line::add_arg(desc_params, arg_prompt_for_password);
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-rpc [--wallet-file=<file>|--generate-from-json=<file>|--wallet-dir=<directory>] [--rpc-bind-port=<port>]",
tools::wallet_rpc_server::tr("This is the RPC monero wallet. It needs to connect to a monero\ndaemon to work correctly."),
@ -2915,6 +2917,10 @@ int main(int argc, char** argv) {
{
return 1;
}
if (should_terminate)
{
return 0;
}
std::unique_ptr<tools::wallet2> wal;
try