Merge pull request #8490 from EOSIO/preemptive-wallet-dir-creation

[develop] <wallet_plugin> Preemptively create the wallet directory to prevent exception

plugins/wallet_plugin/wallet_plugin.cpp

@@ -42,9 +42,10 @@ void wallet_plugin::plugin_initialize(const variables_map& options) {
       if (options.count("wallet-dir")) {
          auto dir = options.at("wallet-dir").as<boost::filesystem::path>();
          if (dir.is_relative())
-            wallet_manager_ptr->set_dir(app().data_dir() / dir);
-         else
-            wallet_manager_ptr->set_dir(dir);
+            dir = app().data_dir() / dir;
+         if( !bfs::exists(dir) )
+            bfs::create_directories(dir);
+         wallet_manager_ptr->set_dir(dir);
       }
       if (options.count("unlock-timeout")) {
          auto timeout = options.at("unlock-timeout").as<int64_t>();

programs/keosd/main.cpp

@@ -26,8 +26,9 @@ bfs::path determine_home_directory()
    else {
       home = getenv("HOME");
    }
-   if(home.empty())
+   if(home.empty()) {
       home = "./";
+   }
    return home;
 }
 
@@ -44,8 +45,13 @@ int main(int argc, char** argv)
          .default_http_port = 0
       });
       app().register_plugin<wallet_api_plugin>();
-      if(!app().initialize<wallet_plugin, wallet_api_plugin, http_plugin>(argc, argv))
+      if(!app().initialize<wallet_plugin, wallet_api_plugin, http_plugin>(argc, argv)) {
+         const auto& opts = app().get_options();
+         if( opts.count("help") || opts.count("version") || opts.count("full-version") || opts.count("print-default-config") ) {
+            return 0;
+         }
          return -1;
+      }
       auto& http = app().get_plugin<http_plugin>();
       http.add_handler("/v1/" + keosd::config::key_store_executable_name + "/stop", [&a=app()](string, string, url_response_callback cb) { cb(200, fc::variant(fc::variant_object())); a.quit(); } );
       app().startup();