|
|
@ -73,7 +73,7 @@ bool AppInit(int argc, char* argv[]) |
|
|
|
// Process help and version before taking care about datadir
|
|
|
|
if (mapArgs.count("-?") || mapArgs.count("-h") || mapArgs.count("-help") || mapArgs.count("-version")) |
|
|
|
{ |
|
|
|
std::string strUsage = _("Zcash Daemon") + " " + _("version") + " " + FormatFullVersion() + "\n" + PrivacyInfo(); |
|
|
|
std::string strUsage = _("Hush Daemon") + " " + _("version") + " " + FormatFullVersion() + "\n" + PrivacyInfo(); |
|
|
|
|
|
|
|
if (mapArgs.count("-version")) |
|
|
|
{ |
|
|
@ -82,7 +82,7 @@ bool AppInit(int argc, char* argv[]) |
|
|
|
else |
|
|
|
{ |
|
|
|
strUsage += "\n" + _("Usage:") + "\n" + |
|
|
|
" zcashd [options] " + _("Start Zcash Daemon") + "\n"; |
|
|
|
" hushd [options] " + _("Start Hush Daemon") + "\n"; |
|
|
|
|
|
|
|
strUsage += "\n" + HelpMessage(HMM_BITCOIND); |
|
|
|
} |
|
|
@ -103,21 +103,21 @@ bool AppInit(int argc, char* argv[]) |
|
|
|
ReadConfigFile(mapArgs, mapMultiArgs); |
|
|
|
} catch (const missing_zcash_conf& e) { |
|
|
|
fprintf(stderr, |
|
|
|
(_("Before starting zcashd, you need to create a configuration file:\n" |
|
|
|
(_("Before starting hushd, you need to create a configuration file:\n" |
|
|
|
"%s\n" |
|
|
|
"It can be completely empty! That indicates you are happy with the default\n" |
|
|
|
"configuration of zcashd. But requiring a configuration file to start ensures\n" |
|
|
|
"that zcashd won't accidentally compromise your privacy if there was a default\n" |
|
|
|
"configuration of hushd. But requiring a configuration file to start ensures\n" |
|
|
|
"that hushd won't accidentally compromise your privacy if there was a default\n" |
|
|
|
"option you needed to change.\n" |
|
|
|
"\n" |
|
|
|
"You can look at the example configuration file for suggestions of default\n" |
|
|
|
"options that you may want to change. It should be in one of these locations,\n" |
|
|
|
"depending on how you installed Zcash:\n") + |
|
|
|
"depending on how you installed Hush:\n") + |
|
|
|
_("- Source code: %s\n" |
|
|
|
"- .deb package: %s\n")).c_str(), |
|
|
|
GetConfigFile().string().c_str(), |
|
|
|
"contrib/debian/examples/zcash.conf", |
|
|
|
"/usr/share/doc/zcash/examples/zcash.conf"); |
|
|
|
"contrib/debian/examples/hush.conf", |
|
|
|
"/usr/share/doc/hush/examples/hush.conf"); |
|
|
|
return false; |
|
|
|
} catch (const std::exception& e) { |
|
|
|
fprintf(stderr,"Error reading configuration file: %s\n", e.what()); |
|
|
@ -137,14 +137,14 @@ bool AppInit(int argc, char* argv[]) |
|
|
|
|
|
|
|
if (fCommandLine) |
|
|
|
{ |
|
|
|
fprintf(stderr, "Error: There is no RPC client functionality in zcashd. Use the zcash-cli utility instead.\n"); |
|
|
|
fprintf(stderr, "Error: There is no RPC client functionality in hushd. Use the hush-cli utility instead.\n"); |
|
|
|
exit(1); |
|
|
|
} |
|
|
|
#ifndef WIN32 |
|
|
|
fDaemon = GetBoolArg("-daemon", false); |
|
|
|
if (fDaemon) |
|
|
|
{ |
|
|
|
fprintf(stdout, "Zcash server starting\n"); |
|
|
|
fprintf(stdout, "Hush server starting\n"); |
|
|
|
|
|
|
|
// Daemonize
|
|
|
|
pid_t pid = fork(); |
|
|
|