pastk/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[linux] support for launching in non-system-wide installs

Browse source
This commit is contained in:
Darafei Praliaskouski 2013-05-27 16:25:22 +03:00 • committed by Alex Zolotarev
parent 87b3992d4d
commit 411017864a
1 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
platform/platform_linux.cpp
View file

@ -51,7 +51,8 @@ Platform::Platform()
else
{
// developer builds with symlink
if (IsFileExistsByFullPath(path + "../../data/eula.html")){
if (IsFileExistsByFullPath(path + "../../data/eula.html"))
{
m_resourcesDir = path + "../../data";
m_writableDir = m_resourcesDir;
}
@ -61,17 +62,15 @@ Platform::Platform()
m_resourcesDir = path + "../../../omim/data";
m_writableDir = m_resourcesDir;
}
// installed version - /opt/MapsWithMe
else if (IsFileExistsByFullPath("/opt/MapsWithMe/share/eula.html"))
m_resourcesDir = "/opt/MapsWithMe/share";
// installed version - /opt/MapsWithMe and unpacked packages
else if (IsFileExistsByFullPath(path + "../share/eula.html"))
m_resourcesDir = path + "../share";
// installed version
else if (IsFileExistsByFullPath("/usr/share/MapsWithMe/eula.html"))
m_resourcesDir = "/usr/share/MapsWithMe";
// all-nearby installs
else if (IsFileExistsByFullPath(path + "/eula.html"))
{
m_resourcesDir = path;
}
}
m_resourcesDir += '/';
m_settingsDir += '/';
@ -108,7 +107,7 @@ string Platform::UniqueClientId() const
string content;
FileReader(machineFile).ReadAsString(content);
return content.substr(0,32);
return content.substr(0, 32);
}
void Platform::RunOnGuiThread(TFunctor const & fn)