GlcoinCore/elements
1
0
Fork 0
mirror of https://github.com/ElementsProject/elements.git synced 2026-08-19 13:27:35 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge 54c4b09f08 into merged_master (Bitcoin PR bitcoin/bitcoin#31042)

Browse source
This commit is contained in:
Tom Trevethan 2026-04-01 17:24:49 +01:00
commit 030ab66c70
56 changed files with 153 additions and 147 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/bitcoind.cpp
View file

@ -136,12 +136,12 @@ static bool ProcessInitCommands(ArgsManager& args)
{
// Process help and version before taking care about datadir
if (HelpRequested(args) || args.IsArgSet("-version")) {
std::string strUsage = PACKAGE_NAME " version " + FormatFullVersion() + "\n";
std::string strUsage = CLIENT_NAME " version " + FormatFullVersion() + "\n";
if (args.IsArgSet("-version")) {
strUsage += FormatParagraph(LicenseInfo());
} else {
strUsage += "\nUsage: elementsd [options] Start " PACKAGE_NAME "\n"
strUsage += "\nUsage: elementsd [options] Start " CLIENT_NAME "\n"
"\n";
strUsage += args.GetHelpMessage();
}
@ -195,7 +195,7 @@ static bool AppInit(NodeContext& node)
if (args.GetBoolArg("-daemon", DEFAULT_DAEMON) || args.GetBoolArg("-daemonwait", DEFAULT_DAEMONWAIT)) {
#if HAVE_DECL_FORK
tfm::format(std::cout, PACKAGE_NAME " starting\n");
tfm::format(std::cout, CLIENT_NAME " starting\n");
// Daemonize
switch (fork_daemon(1, 0, daemon_ep)) { // don't chdir (1), do close FDs (0)