diff options
author | Tyler Chambers <tyler@iHeartAPIs.com> | 2020-11-28 18:43:55 -0500 |
---|---|---|
committer | Tyler Chambers <tyler@iHeartAPIs.com> | 2020-11-28 18:43:55 -0500 |
commit | 6690adba08006739da0060eb4937126bdfa1181a (patch) | |
tree | dbca7183724e614b677825b73311e55df01079cc /src/bitcoind.cpp | |
parent | 555b5d1bf940646a728499cfa1005bcb61383c20 (diff) |
Warn when binaries are built from a dirty branch.
Adjusted version flag behavior in bitcoin-tx, bitcoin-wallet, and
bitcoind to match. Added functionality in gen-manpages.sh to warning when
attempting to generate man pages for binaries built from a dirty
branch.
Diffstat (limited to 'src/bitcoind.cpp')
-rw-r--r-- | src/bitcoind.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/bitcoind.cpp b/src/bitcoind.cpp index 455a82e390..4c89db54cb 100644 --- a/src/bitcoind.cpp +++ b/src/bitcoind.cpp @@ -57,11 +57,11 @@ static bool AppInit(int argc, char* argv[]) if (HelpRequested(args) || args.IsArgSet("-version")) { std::string strUsage = PACKAGE_NAME " version " + FormatFullVersion() + "\n"; - if (args.IsArgSet("-version")) { - strUsage += FormatParagraph(LicenseInfo()) + "\n"; - } else { - strUsage += "\nUsage: bitcoind [options] Start " PACKAGE_NAME "\n"; - strUsage += "\n" + args.GetHelpMessage(); + if (!args.IsArgSet("-version")) { + strUsage += FormatParagraph(LicenseInfo()) + "\n" + "\nUsage: bitcoind [options] Start " PACKAGE_NAME "\n" + "\n"; + strUsage += args.GetHelpMessage(); } tfm::format(std::cout, "%s", strUsage); |