aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorWladimir J. van der Laan <laanwj@protonmail.com>2021-01-13 10:15:07 +0100
committerWladimir J. van der Laan <laanwj@protonmail.com>2021-01-13 10:16:09 +0100
commite7eb37128c3155f074af5f38974934ce6941b0fb (patch)
tree9f6aba402d9c7d5d047a3da5975c6c05071bd8f3 /src
parent60427ee35f280483c8aa7e5f33a95cc093c3fd0a (diff)
parentbc99ae77e431740c0eda8a93152ce15600b3852a (diff)
downloadbitcoin-e7eb37128c3155f074af5f38974934ce6941b0fb.tar.xz
Merge #20913: doc: Add manual page generation for bitcoin-util
bc99ae77e431740c0eda8a93152ce15600b3852a scripted-diff: Fix typo in stub manual pages (Wladimir J. van der Laan) b5e93f873aee96e8d7cd932f5e82efa9ecb6b2f0 doc: Add manual page generation for bitcoin-util (Wladimir J. van der Laan) Pull request description: - Add `-version` option to `bitcoin-util` - Add `bitcoin-util` call to `gen-manpages.sh` - Add stub manual page `bitcoin-util.1` - Add install of `bitcoin-util.1` to build system ACKs for top commit: fanquake: ACK bc99ae77e431740c0eda8a93152ce15600b3852a Tree-SHA512: 948df66c62bbca1cf6da26845dfa63f8f5d036a3d5744add468dd1ce7f442c123d7b0db7011c2e8e3ee6539fd391c7ee2c21b706ec81b21b02821c9501cd077d
Diffstat (limited to 'src')
-rw-r--r--src/bitcoin-util.cpp14
1 files changed, 9 insertions, 5 deletions
diff --git a/src/bitcoin-util.cpp b/src/bitcoin-util.cpp
index f7e670f4e0..b702a68bdf 100644
--- a/src/bitcoin-util.cpp
+++ b/src/bitcoin-util.cpp
@@ -40,6 +40,8 @@ static void SetupBitcoinUtilArgs(ArgsManager &argsman)
{
SetupHelpOptions(argsman);
+ argsman.AddArg("-version", "Print version and exit", ArgsManager::ALLOW_ANY, OptionsCategory::OPTIONS);
+
SetupChainParamsBaseOptions(argsman);
}
@@ -62,12 +64,14 @@ static int AppInitUtil(int argc, char* argv[])
return EXIT_FAILURE;
}
- if (argc < 2 || HelpRequested(gArgs)) {
+ if (argc < 2 || HelpRequested(gArgs) || gArgs.IsArgSet("-version")) {
// First part of help message is specific to this utility
- std::string strUsage = PACKAGE_NAME " bitcoin-util utility version " + FormatFullVersion() + "\n\n" +
- "Usage: bitcoin-util [options] [commands] Do stuff\n" +
- "\n";
- strUsage += gArgs.GetHelpMessage();
+ std::string strUsage = PACKAGE_NAME " bitcoin-util utility version " + FormatFullVersion() + "\n";
+ if (!gArgs.IsArgSet("-version")) {
+ strUsage += "\n"
+ "Usage: bitcoin-util [options] [commands] Do stuff\n";
+ strUsage += "\n" + gArgs.GetHelpMessage();
+ }
tfm::format(std::cout, "%s", strUsage);