organicmaps/organicmaps-tmp
Archived
13
Fork 1
Code Issues 2.7k Pull requests 182 Projects Releases 65 Wiki Activity Actions

[platform][linux] Use $XDG_DATA_HOME if defined #2734

Merged
Ferenc- merged 1 commit from XDG_DATA_HOME into master 2022-06-15 04:52:34 +00:00
Conversation 0 Commits 1 Files changed 1 +7 -1
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
platform/platform_linux.cpp
View file

@ -107,6 +107,7 @@ Platform::Platform()
JoinPath(*execDir, "..", "organicmaps", "data"), // build-omim-{debug,release}
JoinPath(*execDir, "..", "share"), // installed version with packages
JoinPath(*execDir, "..", "OMaps"), // installed version without packages
JoinPath(*execDir, "..", "share", "organicmaps", "data"), // flatpak-build
};
for (auto const & dir : dirsToScan)
{
@ -122,7 +123,12 @@ Platform::Platform()
// Use ~/.local/share/OMaps if resources directory was not writable.
if (!m_resourcesDir.empty() && m_writableDir.empty())
{
m_writableDir = JoinPath(*homeDir, ".local", "share", "OMaps");
// The writableLocation does the same for AppDataLocation, AppLocalDataLocation,
// and GenericDataLocation. Provided, that test mode is not enabled, then
// first it checks ${XDG_DATA_HOME}, if empty then it falls back to ${HOME}/.local/share
m_writableDir = JoinPath(QStandardPaths::writableLocation(
QStandardPaths::AppDataLocation).toStdString(), "OMaps");
if (!MkDirRecursively(m_writableDir))
MYTHROW(FileSystemException, ("Can't create writable directory:", m_writableDir));
}