This commit is contained in:
Adam Ierymenko 2019-09-22 19:25:40 -07:00
parent 90d4d79828
commit 70d5da1e2a
No known key found for this signature in database
GPG key ID: C8877CF2D7A5D7F3
5 changed files with 86 additions and 6 deletions

View file

@ -406,15 +406,15 @@ std::string OSUtils::platformDefaultHomePath()
#ifdef __APPLE__
// /Library/... on Apple
return std::string("/Library/Application Support/ZeroTier/One");
return std::string("/Library/Application Support/ZeroTier");
#else
#ifdef __BSD__
// BSD likes /var/db instead of /var/lib
return std::string("/var/db/zerotier-one");
return std::string("/var/db/zerotier");
#else
// Use /var/lib for Linux and other *nix
return std::string("/var/lib/zerotier-one");
return std::string("/var/lib/zerotier");
#endif
#endif
@ -425,11 +425,11 @@ std::string OSUtils::platformDefaultHomePath()
// Look up app data folder on Windows, e.g. C:\ProgramData\...
char buf[16384];
if (SUCCEEDED(SHGetFolderPathA(NULL,CSIDL_COMMON_APPDATA,NULL,0,buf)))
return (std::string(buf) + "\\ZeroTier\\One");
else return std::string("C:\\ZeroTier\\One");
return (std::string(buf) + "\\ZeroTier");
else return std::string("C:\\ZeroTier");
#else
return (std::string(ZT_PATH_SEPARATOR_S) + "ZeroTier" + ZT_PATH_SEPARATOR_S + "One"); // UNKNOWN PLATFORM
return (std::string(ZT_PATH_SEPARATOR_S) + "ZeroTier"); // UNKNOWN PLATFORM
#endif