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

wallet cli/rpc: terminate execution with code 0 when --help or --version is given

Browse source
This commit is contained in:
stoffu 2018-04-15 14:52:53 +09:00
parent 8fdf645397
commit f36132a837
No known key found for this signature in database
GPG key ID: 41DAB8343A9EC012
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

@ -2895,7 +2895,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."),
@ -2909,6 +2911,10 @@ int main(int argc, char** argv) {
{
return 1;
}
if (should_terminate)
{
return 0;
}
std::unique_ptr<tools::wallet2> wal;
try