diff --git a/src/bitcoin-cli.cpp b/src/bitcoin-cli.cpp index 4954a44a2..16cda9dc0 100644 --- a/src/bitcoin-cli.cpp +++ b/src/bitcoin-cli.cpp @@ -71,6 +71,8 @@ static bool AppInitRPC(int argc, char* argv[]) " zcash-cli [options] help " + _("Get help for a command") + "\n"; strUsage += "\n" + HelpMessageCli(); + } else { + strUsage += LicenseInfo(); } fprintf(stdout, "%s", strUsage.c_str()); diff --git a/src/init.cpp b/src/init.cpp index 53f6fb832..9a7fd8829 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -460,19 +460,6 @@ std::string HelpMessage(HelpMessageMode mode) return strUsage; } -std::string LicenseInfo() -{ - return FormatParagraph(strprintf(_("Copyright (C) 2009-%i The Bitcoin Core Developers"), COPYRIGHT_YEAR)) + "\n" + - FormatParagraph(strprintf(_("Copyright (C) 2015-%i The Zcash Developers"), COPYRIGHT_YEAR)) + "\n" + - "\n" + - FormatParagraph(_("This is experimental software.")) + "\n" + - "\n" + - FormatParagraph(_("Distributed under the MIT software license, see the accompanying file COPYING or .")) + "\n" + - "\n" + - FormatParagraph(_("This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit and cryptographic software written by Eric Young and UPnP software written by Thomas Bernard.")) + - "\n"; -} - static void BlockNotifyCallback(const uint256& hashNewTip) { std::string strCmd = GetArg("-blocknotify", ""); diff --git a/src/init.h b/src/init.h index cfc88255b..34290b276 100644 --- a/src/init.h +++ b/src/init.h @@ -34,7 +34,5 @@ enum HelpMessageMode { /** Help for options shared between UI and daemon (for -help) */ std::string HelpMessage(HelpMessageMode mode); -/** Returns licensing information (for -version) */ -std::string LicenseInfo(); #endif // BITCOIN_INIT_H diff --git a/src/util.cpp b/src/util.cpp index b667acc5e..b38f67ada 100644 --- a/src/util.cpp +++ b/src/util.cpp @@ -815,3 +815,16 @@ void SetThreadPriority(int nPriority) #endif // PRIO_THREAD #endif // WIN32 } + +std::string LicenseInfo() +{ + return FormatParagraph(strprintf(_("Copyright (C) 2009-%i The Bitcoin Core Developers"), COPYRIGHT_YEAR)) + "\n" + + FormatParagraph(strprintf(_("Copyright (C) 2015-%i The Zcash Developers"), COPYRIGHT_YEAR)) + "\n" + + "\n" + + FormatParagraph(_("This is experimental software.")) + "\n" + + "\n" + + FormatParagraph(_("Distributed under the MIT software license, see the accompanying file COPYING or .")) + "\n" + + "\n" + + FormatParagraph(_("This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit and cryptographic software written by Eric Young and UPnP software written by Thomas Bernard.")) + + "\n"; +} diff --git a/src/util.h b/src/util.h index ef3a347fa..bbfafaf60 100644 --- a/src/util.h +++ b/src/util.h @@ -135,6 +135,9 @@ boost::filesystem::path GetTempPath(); void ShrinkDebugFile(); void runCommand(std::string strCommand); +/** Returns licensing information (for -version) */ +std::string LicenseInfo(); + inline bool IsSwitchChar(char c) { #ifdef WIN32