From 72adf58889e476dc00d55b79d760fffe331555ed Mon Sep 17 00:00:00 2001 From: John Colvin Date: Wed, 6 Aug 2025 15:09:55 +0000 Subject: [PATCH] Add environment variable override for app data path Historically, ~/sparkdata on linux, and ~/AppData/Roaming/bts on win. Now that we may run multiple exes at once (api server, pubsub, sparkd, etc.), we need to support multiple data dirs on the same host. --- src/lib_spark/spark/os/os.cpp | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/src/lib_spark/spark/os/os.cpp b/src/lib_spark/spark/os/os.cpp index 1e03adf0c..304d10cbe 100644 --- a/src/lib_spark/spark/os/os.cpp +++ b/src/lib_spark/spark/os/os.cpp @@ -4,6 +4,7 @@ #include "spark/utils/bts_assert.h" #include "spark/utils/bts_debugger.h" #include "spark/utils/helper_macros.h" +#include "spark/utils/string_utils.h" #include #include @@ -740,10 +741,23 @@ Path app_data_path() { if (app_data_path_) { return *app_data_path_; } - std::string base_path; - bts_assert(try_expand_env(APP_DATA_DIR, base_path)); - app_data_path_ = Path{base_path} / "bts" / process_path().stem(); - app_data_path_ = app_data_path_->make_preferred(); + std::string path_override_key = + fmt::format("{}__APPDATA", get_application_name()); + system::string_utils::to_upper(path_override_key); + const char *path_override = std::getenv(path_override_key.c_str()); + if (path_override) { + std::string path_override_str = path_override; + if (path_override_str.ends_with('/')) { + path_override_str = + path_override_str.substr(0, path_override_str.size() - 1); + } + app_data_path_ = path_override_str; + } else { + std::string base_path; + bts_assert(try_expand_env(APP_DATA_DIR, base_path)); + app_data_path_ = Path{base_path} / "bts" / process_path().stem(); + app_data_path_ = app_data_path_->make_preferred(); + } return *app_data_path_; }