rayelliott
/
barrier
mirror of https://github.com/debauchee/barrier.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

make linux/bsd data directory conform to freedesktop standards. fixes #31

This commit is contained in:
walker0643 2018-05-07 12:54:48 -04:00
parent 0b5ca57b9c
commit 642eb33446
1 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/lib/common/unix/DataDirectories.cpp
View File

@ -18,14 +18,11 @@
#include "../DataDirectories.h" #include "../DataDirectories.h"
#include <unistd.h> // sysconf #include <unistd.h> // sysconf
#include <stdlib.h> // getenv
#include <sys/types.h> // getpwuid(_r) #include <sys/types.h> // getpwuid(_r)
#include <pwd.h> // getpwuid(_r) #include <pwd.h> // getpwuid(_r)
#ifdef WINAPI_XWINDOWS const std::string ProfileSubdir = "/barrier";
const std::string ProfileSubdir = "/.barrier";
#else // macos
const std::string ProfileSubdir = "/Library/Application Support/Barrier";
#endif
static std::string pw_dir(struct passwd* pwentp) static std::string pw_dir(struct passwd* pwentp)
{ {
@ -61,10 +58,26 @@ static std::string unix_home()
#endif // HAVE_GETPWUID_R #endif // HAVE_GETPWUID_R
static std::string profile_basedir()
{
#ifdef WINAPI_XWINDOWS
// linux/bsd adheres to freedesktop standards
// https://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html
const char* dir = getenv("XDG_DATA_HOME");
if (dir != NULL)
return dir;
return unix_home() + "/.local/share";
#else
// macos has its own standards
// https://developer.apple.com/library/content/documentation/General/Conceptual/MOSXAppProgrammingGuide/AppRuntime/AppRuntime.html
return unix_home() + "/Library/Application Support";
#endif
}
const std::string& DataDirectories::profile() const std::string& DataDirectories::profile()
{ {
if (_profile.empty()) if (_profile.empty())
_profile = unix_home() + ProfileSubdir; _profile = profile_basedir() + ProfileSubdir;
return _profile; return _profile;
} }
const std::string& DataDirectories::profile(const std::string& path) const std::string& DataDirectories::profile(const std::string& path)