From a3d1eff5718b5ef6052eb68d3d6cd93a9c0d9bc1 Mon Sep 17 00:00:00 2001
From: Sebastian Hahta <joseha@utu.fi>
Date: Fri, 14 Aug 2020 16:34:06 +0300
Subject: [PATCH] remove subdir
---
components/common/cpp/include/ftl/file.hpp | 1 -
components/common/cpp/src/configuration.cpp | 2 +-
components/common/cpp/src/file.cpp | 10 +++-------
3 files changed, 4 insertions(+), 9 deletions(-)
diff --git a/components/common/cpp/include/ftl/file.hpp b/components/common/cpp/include/ftl/file.hpp
index bd72b63a7..765607974 100644
--- a/components/common/cpp/include/ftl/file.hpp
+++ b/components/common/cpp/include/ftl/file.hpp
@@ -16,7 +16,6 @@ namespace file {
std::filesystem::path home_dir();
std::filesystem::path config_dir();
-std::filesystem::path config_dir(const std::filesystem::path& subdirectory);
bool is_file(const std::filesystem::path &path);
diff --git a/components/common/cpp/src/configuration.cpp b/components/common/cpp/src/configuration.cpp
index f03d77e16..6f717526f 100644
--- a/components/common/cpp/src/configuration.cpp
+++ b/components/common/cpp/src/configuration.cpp
@@ -161,7 +161,7 @@ optional<string> ftl::config::locateFile(const string &name) {
}
if (is_file("./"+name)) return "./"+name;
- if (is_file(config_dir("ftl") / name)) return (ftl::file::config_dir("ftl") / name).string();
+ if (is_file(config_dir() / name)) return (ftl::file::config_dir() / name).string();
if (is_file(string(FTL_GLOBAL_CONFIG_ROOT) +"/"+ name)) return string(FTL_GLOBAL_CONFIG_ROOT) +"/"+ name;
return {};
}
diff --git a/components/common/cpp/src/file.cpp b/components/common/cpp/src/file.cpp
index b595e09d0..b99936b86 100644
--- a/components/common/cpp/src/file.cpp
+++ b/components/common/cpp/src/file.cpp
@@ -19,20 +19,16 @@ path home_dir() {
return std::filesystem::absolute(path(home));
}
-path config_dir(const path& subdir) {
+path config_dir() {
#if defined(_MSC_VER)
- return path(std::getenv("APPDATA")) / subdir;
+ return path(std::getenv("APPDATA")) / "ftl";
#elif defined(__GNUC__)
- return home_dir() / ".config";
+ return home_dir() / ".config" / "ftl";
#else
static_assert(false, "unsupported compiler");
#endif
}
-path config_dir() {
- return config_dir(path());
-}
-
bool is_file(const path& p) {
return std::filesystem::is_regular_file(p);
}
--
GitLab