Prefer ~/.hush/HUSH3 to ~/.komodo/HUSH3 if both exist, unix edition

This commit is contained in:
Duke Leto
2021-07-19 22:02:44 -04:00
parent 4517d614cc
commit 5fb4eafd1a

View File

@@ -548,13 +548,21 @@ boost::filesystem::path GetDefaultDataDir()
}
#else
// Unix
fs::path tmppath = pathRet / ".komodo" / symbol;
// New directory :)
fs::path tmppath = pathRet / ".hush" / symbol;
// Always use .hush/HUSH3, if it exists (even if .komodo/HUSH3 exists)
if(fs::is_directory(tmppath)) {
// legacy directory, use that for backward compat
return tmppath;
} else {
// New directory :)
// This is the legacy location
tmppath = pathRet / ".komodo" / symbol;
if(fs::is_directory(tmppath)) {
// existing legacy directory, use that for backward compat
return tmppath;
} else {
// For new clones, use .hush/HUSH3
tmppath = pathRet / ".hush" / symbol;
}
return tmppath;
}
#endif