Add CLI switch to display binary version

src/gridcoinresearchd.cpp

@@ -54,15 +54,8 @@ bool AppInit(int argc, char* argv[])
         //
         // If Qt is used, parameters/bitcoin.conf are parsed in qt/bitcoin.cpp's main()
         ParseParameters(argc, argv);
-        LogPrintf("AppInit");
-        if (!boost::filesystem::is_directory(GetDataDir(false)))
-        {
-            fprintf(stderr, "Error: Specified directory does not exist\n");
-            Shutdown(NULL);
-        }
-        ReadConfigFile(mapArgs, mapMultiArgs);
 
-        if (mapArgs.count("-?") || mapArgs.count("--help"))
+        if (mapArgs.count("-?") || mapArgs.count("-help"))
         {
             // First part of help message is specific to bitcoind / RPC client
             std::string strUsage = _("Gridcoin version") + " " + FormatFullVersion() + "\n\n" +
@@ -78,6 +71,23 @@ bool AppInit(int argc, char* argv[])
             return false;
         }
 
+        if (mapArgs.count("-version"))
+        {
+            fprintf(stdout, "%s", VersionMessage().c_str());
+
+            return false;
+        }
+
+        LogPrintf("AppInit");
+
+        if (!boost::filesystem::is_directory(GetDataDir(false)))
+        {
+            fprintf(stderr, "Error: Specified directory does not exist\n");
+            Shutdown(NULL);
+        }
+
+        ReadConfigFile(mapArgs, mapMultiArgs);
+
         // Command-line RPC  - Test this - ensure single commands execute and exit please.
         for (int i = 1; i < argc; i++)
             if (!IsSwitchChar(argv[i][0]) && !boost::algorithm::istarts_with(argv[i], "gridcoinresearchd"))

src/init.cpp

@@ -200,6 +200,7 @@ std::string HelpMessage()
     //gridcoinresearch ports: testnet ? 32748 : 32749;
     string strUsage = _("Options:") + "\n" +
         "  -?                     " + _("This help message") + "\n" +
+        "  -version               " + _("Print version and exit") + "\n" +
         "  -conf=<file>           " + _("Specify configuration file (default: gridcoinresearch.conf)") + "\n" +
         "  -pid=<file>            " + _("Specify pid file (default: gridcoind.pid)") + "\n" +
         "  -datadir=<dir>         " + _("Specify data directory") + "\n" +
@@ -290,6 +291,15 @@ std::string HelpMessage()
     return strUsage;
 }
 
+std::string VersionMessage()
+{
+    // Note: this prints the version of the binary. It does not necessarily
+    // match the version of the running wallet when using the CLI to invoke
+    // RPC functions on a remote server.
+    //
+    return "Gridcoin Core " + FormatFullVersion() + "\n";
+}
+
 /** Sanity checks
  *  Ensure that Bitcoin is running in a usable environment with all
  *  necessary library support.

src/init.h

@@ -19,7 +19,7 @@ bool AppInit2(ThreadHandlerPtr threads);
 void ThreadAppInit2(ThreadHandlerPtr th);
 
 std::string HelpMessage();
+std::string VersionMessage();
 std::string LogSomething();
 
-
 #endif

src/qt/bitcoin.cpp

@@ -280,7 +280,7 @@ int main(int argc, char *argv[])
 
     // Show help message immediately after parsing command-line options (for "-lang") and setting locale,
     // but before showing splash screen.
-    if (mapArgs.count("-?") || mapArgs.count("--help"))
+    if (mapArgs.count("-?") || mapArgs.count("-help"))
     {
         GUIUtil::HelpMessageBox help;
         help.showOrPrint();

src/qt/bitcoinstrings.cpp

@@ -231,6 +231,7 @@ QT_TRANSLATE_NOOP("bitcoin-core", "POR Blocks Verified"),
 QT_TRANSLATE_NOOP("bitcoin-core", "Password for JSON-RPC connections"),
 QT_TRANSLATE_NOOP("bitcoin-core", "Please wait for new user wizard to start..."),
 QT_TRANSLATE_NOOP("bitcoin-core", "Prepend debug output with timestamp"),
+QT_TRANSLATE_NOOP("bitcoin-core", "Print version and exit"),
 QT_TRANSLATE_NOOP("bitcoin-core", "Project email mismatch"),
 QT_TRANSLATE_NOOP("bitcoin-core", "Public Key"),
 QT_TRANSLATE_NOOP("bitcoin-core", "Question"),