#119 fix sign log path

arrayio · Feb 15, 2019 · d189209 · d189209
1 parent 39caf72
commit d189209
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 12 deletions.
diff --git a/keychain_lib/include/keychain_lib/keychain_commands.hpp b/keychain_lib/include/keychain_lib/keychain_commands.hpp
@@ -62,8 +62,8 @@
 #else
 
 #if defined(macintosh) || defined(__APPLE__) || defined(__APPLE_CC__)
-        #define KEY_DEFAULT_PATH  "/keychain"
-        #define LOG_DEFAULT_PATH  "/keychain/logs"
+        #define KEY_DEFAULT_PATH  "keychain"
+        #define LOG_DEFAULT_PATH  "keychain/logs"
 #else
 
 #ifdef _WIN32

diff --git a/keychain_lib/src/keychain.cpp b/keychain_lib/src/keychain.cpp
@@ -48,8 +48,7 @@ keychain::keychain()
 {
 #if defined(macintosh) || defined(__APPLE__) || defined(__APPLE_CC__)
   auto key_dir = bfs::path(getenv("HOME"));
-  key_dir += "/";
-  key_dir += bfs::path(KEY_DEFAULT_PATH_);
+  key_dir += bfs::path("/"KEY_DEFAULT_PATH_);
 #else
   bfs::path key_dir(KEY_DEFAULT_PATH_);
 #endif

diff --git a/keychain_lib/src/keychain_logger.cpp b/keychain_lib/src/keychain_logger.cpp
@@ -20,8 +20,7 @@ logger_singleton::logger_singleton(std::string postfix)
 {
 #if defined(macintosh) || defined(__APPLE__) || defined(__APPLE_CC__)
     auto dir = bfs::path(getenv("HOME"));
-    dir += "/";
-    dir += bfs::path(LOG_DEFAULT_PATH);
+    dir += bfs::path("/"LOG_DEFAULT_PATH);
 #else
   bfs::path dir(LOG_DEFAULT_PATH);
 #endif

diff --git a/keychain_lib/src/keyfile_singleton.cpp b/keychain_lib/src/keyfile_singleton.cpp
@@ -47,7 +47,7 @@ void keyfile_singleton::keydata_load()
 {
 #if defined(macintosh) || defined(__APPLE__) || defined(__APPLE_CC__)
   auto key_dir = bfs::path(getenv("HOME"));
-  key_dir += bfs::path(KEY_DEFAULT_PATH_);
+  key_dir += bfs::path("/"KEY_DEFAULT_PATH_);
 #else
   bfs::path key_dir(KEY_DEFAULT_PATH_);
 #endif
@@ -80,7 +80,7 @@ void keyfile_singleton::signlog_load()
 {
 #if defined(macintosh) || defined(__APPLE__) || defined(__APPLE_CC__)
   auto dir = bfs::path(getenv("HOME"));
-  dir += bfs::path(SIGN_LOGS_DEFAULT_PATH_);
+  dir += bfs::path("/"SIGN_LOGS_DEFAULT_PATH_);
 #else
   bfs::path dir(SIGN_LOGS_DEFAULT_PATH_);
 #endif
@@ -263,7 +263,7 @@ void keyfile_singleton::flush_keyfile_impl(const value_t& keyfile_data) const
 {
 #if defined(macintosh) || defined(__APPLE__) || defined(__APPLE_CC__)
   auto filepath = bfs::path(getenv("HOME"));
-  filepath += bfs::path(KEY_DEFAULT_PATH_"/");
+  filepath += bfs::path("/"KEY_DEFAULT_PATH_"/");
 #else
   bfs::path filepath(KEY_DEFAULT_PATH_"/");
 #endif
@@ -289,9 +289,9 @@ void keyfile_singleton::flush_logrecords_impl(const prim_key_type& key, const lo
 {
 #if defined(macintosh) || defined(__APPLE__) || defined(__APPLE_CC__)
   auto filepath = bfs::path(getenv("HOME"));
-  filepath += bfs::path(KEY_DEFAULT_PATH_"/");
+  filepath += bfs::path(SIGN_LOGS_DEFAULT_PATH_"/");
 #else
-  bfs::path filepath(KEY_DEFAULT_PATH_"/");
+  bfs::path filepath(SIGN_LOGS_DEFAULT_PATH_"/");
 #endif
   keyfile_format::signlog_file_t logfile;
   logfile.public_key = key;
@@ -310,7 +310,7 @@ void keyfile_singleton::flush_all() const
 {
 #if defined(macintosh) || defined(__APPLE__) || defined(__APPLE_CC__)
   auto keyfile_dir = bfs::path(getenv("HOME"));
-  keyfile_dir += bfs::path(KEY_DEFAULT_PATH_);
+  keyfile_dir += bfs::path("/"KEY_DEFAULT_PATH_);
 #else
   bfs::path keyfile_dir(KEY_DEFAULT_PATH_);
 #endif