From 87c5f874e45948ea621eae9d9d895c894dc6807c Mon Sep 17 00:00:00 2001 From: albertony <12441419+albertony@users.noreply.github.com> Date: Sat, 5 Dec 2020 01:12:19 +0100 Subject: [PATCH] Include --profile-dir in help text --- src/lib/barrier/App.h | 4 ++-- src/lib/barrier/ServerApp.cpp | 8 +++++++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/lib/barrier/App.h b/src/lib/barrier/App.h index 8040da86..b5cce7e8 100644 --- a/src/lib/barrier/App.h +++ b/src/lib/barrier/App.h @@ -166,8 +166,8 @@ private: " -l --log write log messages to file.\n" \ " --no-tray disable the system tray icon.\n" \ " --enable-drag-drop enable file drag & drop.\n" \ - " --enable-crypto enable the crypto (ssl) plugin.\n" - + " --enable-crypto enable the crypto (ssl) plugin.\n" \ + " --profile-dir use named profile directory instead.\n" #define HELP_COMMON_INFO_2 \ " -h, --help display this help and exit.\n" \ " --version display version information and exit.\n" diff --git a/src/lib/barrier/ServerApp.cpp b/src/lib/barrier/ServerApp.cpp index 18cf9358..ed064f87 100644 --- a/src/lib/barrier/ServerApp.cpp +++ b/src/lib/barrier/ServerApp.cpp @@ -128,6 +128,12 @@ ServerApp::help() # define WINAPI_INFO "" #endif + // refer to custom profile directory even if not saved yet + String profilePath = argsBase().m_profileDirectory; + if (profilePath.empty()) { + profilePath = DataDirectories::profile(); + } + std::ostringstream buffer; buffer << "Start the barrier server component." << std::endl << std::endl @@ -150,7 +156,7 @@ ServerApp::help() << std::endl << "If no configuration file pathname is provided then the first of the" << std::endl << "following to load successfully sets the configuration:" << std::endl - << " " << PathUtilities::concat(DataDirectories::profile(), USR_CONFIG_NAME) << std::endl + << " " << PathUtilities::concat(profilePath, USR_CONFIG_NAME) << std::endl << " " << PathUtilities::concat(DataDirectories::systemconfig(), SYS_CONFIG_NAME) << std::endl; LOG((CLOG_PRINT "%s", buffer.str().c_str()));