未验证 提交 fd59a31b 编写于 作者: K Kevin Heifner 提交者: GitHub

Merge pull request #5101 from EugeneChung/custom_exe_name

Make customization point for executable names
...@@ -8,4 +8,5 @@ namespace eosio { namespace client { namespace config { ...@@ -8,4 +8,5 @@ namespace eosio { namespace client { namespace config {
constexpr char version_str[] = "${cleos_BUILD_VERSION}"; constexpr char version_str[] = "${cleos_BUILD_VERSION}";
constexpr char locale_path[] = "${LOCALEDIR}"; constexpr char locale_path[] = "${LOCALEDIR}";
constexpr char locale_domain[] = "${LOCALEDOMAIN}"; constexpr char locale_domain[] = "${LOCALEDOMAIN}";
constexpr char key_store_executable_name[] = "${KEY_STORE_EXECUTABLE_NAME}";
}}} }}}
...@@ -763,9 +763,9 @@ void ensure_keosd_running(CLI::App* app) { ...@@ -763,9 +763,9 @@ void ensure_keosd_running(CLI::App* app) {
// This extra check is necessary when running cleos like this: ./cleos ... // This extra check is necessary when running cleos like this: ./cleos ...
if (binPath.filename_is_dot()) if (binPath.filename_is_dot())
binPath.remove_filename(); binPath.remove_filename();
binPath.append("keosd"); // if cleos and keosd are in the same installation directory binPath.append(key_store_executable_name); // if cleos and keosd are in the same installation directory
if (!boost::filesystem::exists(binPath)) { if (!boost::filesystem::exists(binPath)) {
binPath.remove_filename().remove_filename().append("keosd").append("keosd"); binPath.remove_filename().remove_filename().append("keosd").append(key_store_executable_name);
} }
const auto& lo_address = resolved_url.resolved_addresses.front(); const auto& lo_address = resolved_url.resolved_addresses.front();
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册