2 Commits

Author SHA1 Message Date
a409408ac0 fix
Some checks failed
BlockStorage/repertory_linux_builds/pipeline/head There was a failure building this commit
2024-07-17 17:21:27 -05:00
b121c9778f fix 2024-07-17 17:19:30 -05:00
2 changed files with 72 additions and 70 deletions

View File

@ -5,7 +5,7 @@ PROJECT_NAME="repertory"
PROJECT_URL="https://git.fifthgrid.com/blockstorage/repertory"
PROJECT_COMPANY_NAME="https://git.fifthgrid.com/blockstorage"
PROJECT_COPYRIGHT="Copyright <2018-2024> <MIT License> <${PROJECT_URL}>"
PROJECT_COPYRIGHT="Copyright \<2018-2024\> \<MIT License\> \<${PROJECT_URL}\>"
PROJECT_DESC="Mount utility for Sia and S3"
PROJECT_MAJOR_VERSION=2

View File

@ -156,13 +156,14 @@ auto app_config::default_data_directory(const provider_type &prov)
{std::string{REPERTORY_DATA_NAME}, app_config::get_provider_name(prov)});
#else
#if defined(__APPLE__)
auto data_directory = utils::path::resolve(
std::string("~/Library/Application Support/") + REPERTORY_DATA_NAME +
'/' + app_config::get_provider_name(prov));
#else
auto data_directory =
utils::path::resolve(std::string("~/.local/") + REPERTORY_DATA_NAME +
'/' + app_config::get_provider_name(prov));
utils::path::resolve(std::string{"~/Library/Application Support/"} +
std::string{REPERTORY_DATA_NAME} + '/' +
app_config::get_provider_name(prov));
#else
auto data_directory = utils::path::resolve(
std::string{"~/.local/"} + std::string{REPERTORY_DATA_NAME} + '/' +
app_config::get_provider_name(prov));
#endif
#endif
return data_directory;
@ -258,7 +259,8 @@ auto app_config::get_json() const -> json {
{"UsePathStyle", s3_config_.use_path_style},
{"UseRegionInURL", s3_config_.use_region_in_url},
}},
{"Version", version_}};
{"Version", version_}
};
if (prov_ == provider_type::encrypt) {
ret.erase("ChunkDownloaderTimeoutSeconds");