smw/deskflow
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feat: Respect XDG_CONFIG_HOME in server/client

Browse source
This commit is contained in:
Nick Bolton 2024-10-14 16:36:02 +01:00
parent 9c4f6e6d0b
commit 636e3eab96
1 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/lib/arch/unix/ArchFileUnix.cpp
View file

@ -19,6 +19,7 @@
#include "arch/unix/ArchFileUnix.h" #include "arch/unix/ArchFileUnix.h"
#include <cstring> #include <cstring>
#include <filesystem>
#include <pwd.h> #include <pwd.h>
#include <stdio.h> #include <stdio.h>
#include <sys/types.h> #include <sys/types.h>
@ -100,17 +101,21 @@ std::string ArchFileUnix::getPluginDirectory() {
} }
std::string ArchFileUnix::getProfileDirectory() { std::string ArchFileUnix::getProfileDirectory() {
String dir;
if (!m_profileDirectory.empty()) { if (!m_profileDirectory.empty()) {
dir = m_profileDirectory; return m_profileDirectory;
} else { } else {
const std::filesystem::path homeDir = getUserDirectory();
#if WINAPI_XWINDOWS #if WINAPI_XWINDOWS
dir = getUserDirectory().append("/.config/" DESKFLOW_APP_NAME); const auto xdgDir = std::getenv("XDG_CONFIG_HOME");
if (xdgDir != nullptr) {
return std::filesystem::path(xdgDir) / DESKFLOW_APP_NAME;
} else {
return homeDir / ".config" / DESKFLOW_APP_NAME;
}
#else #else
dir = getUserDirectory().append("/Library/" DESKFLOW_APP_NAME); return homeDir / "Library" / DESKFLOW_APP_NAME;
#endif #endif
} }
return dir;
} }
std::string std::string