From a5843203574aba93a94df09eed9c922ec0f41d78 Mon Sep 17 00:00:00 2001 From: Jeff Garzik Date: Fri, 15 Apr 2011 03:58:28 -0400 Subject: Ensure version number->string conversion is consistent --- init.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'init.cpp') diff --git a/init.cpp b/init.cpp index effac288f..906bcbe13 100644 --- a/init.cpp +++ b/init.cpp @@ -143,7 +143,7 @@ bool AppInit2(int argc, char* argv[]) { string beta = VERSION_IS_BETA ? _(" beta") : ""; string strUsage = string() + - _("Bitcoin version") + " " + FormatVersion(VERSION) + pszSubVer + beta + "\n\n" + + _("Bitcoin version") + " " + FormatFullVersion() + "\n\n" + _("Usage:") + "\t\t\t\t\t\t\t\t\t\t\n" + " bitcoin [options] \t " + "\n" + " bitcoin [options] [params]\t " + _("Send command to -server or bitcoind\n") + @@ -262,7 +262,7 @@ bool AppInit2(int argc, char* argv[]) if (!fDebug && !pszSetDataDir[0]) ShrinkDebugFile(); printf("\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n"); - printf("Bitcoin version %s%s%s\n", FormatVersion(VERSION).c_str(), pszSubVer, VERSION_IS_BETA ? _(" beta") : ""); + printf("Bitcoin version %s\n", FormatFullVersion().c_str()); #ifdef GUI printf("OS version %s\n", ((string)wxGetOsDescription()).c_str()); printf("System default language is %d %s\n", g_locale.GetSystemLanguage(), ((string)g_locale.GetSysName()).c_str()); -- cgit v1.2.3