atria-soft/etk
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[DEV] update folder for generic package

Browse Source
This commit is contained in:
Edouard DUPIN 2015-09-08 21:46:04 +02:00
parent aec415ea7c
commit b23925c8d5
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
etk/os/FSNode.cpp
View File

@ -310,7 +310,6 @@ std::string getApplicationPath() {
void etk::initDefaultFolder(const char* _applName) { void etk::initDefaultFolder(const char* _applName) {
baseApplName = _applName; baseApplName = _applName;
char cCurrentPath[FILENAME_MAX]; char cCurrentPath[FILENAME_MAX];
char * basicPath = getenv("HOME"); char * basicPath = getenv("HOME");
if (NULL == basicPath) { if (NULL == basicPath) {
TK_WARNING("ERROR while trying to get the path of the home folder"); TK_WARNING("ERROR while trying to get the path of the home folder");
@ -339,10 +338,8 @@ void etk::initDefaultFolder(const char* _applName) {
} else { } else {
baseRunPathInHome = baseRunPath; baseRunPathInHome = baseRunPath;
} }
} }
TK_DBG_MODE("Find Basic running PATH : '" << baseRunPath << "'"); TK_DBG_MODE("Find Basic running PATH : '" << baseRunPath << "'");
#ifndef __TARGET_OS__Android #ifndef __TARGET_OS__Android
std::string binaryPath = getApplicationPath(); std::string binaryPath = getApplicationPath();
binaryPath = replace(binaryPath, '\\', '/'); binaryPath = replace(binaryPath, '\\', '/');
@ -367,9 +364,15 @@ void etk::initDefaultFolder(const char* _applName) {
std::string theoricInstalledName = "/usr/bin"; std::string theoricInstalledName = "/usr/bin";
theoricInstalledName += binaryName; theoricInstalledName += binaryName;
TK_VERBOSE(" position : '" << binaryPath << "' installed position : '" << theoricInstalledName << "'"); TK_DEBUG(" position : '" << binaryPath << "' installed position : '" << theoricInstalledName << "'");
if (binaryPath != theoricInstalledName) { if (binaryPath != theoricInstalledName) {
// can also be in application package:
std::string endWith = binaryName + ".app/bin";
if (etk::end_with(binaryPath, endWith) == true) {
TK_INFO("Application istall in user standalone mode: '" << binaryPath << "'");
} else {
TK_INFO(" base path is not correct try to find it : (must only appear in test and not when installed) base name : '" << binaryPath << "'"); TK_INFO(" base path is not correct try to find it : (must only appear in test and not when installed) base name : '" << binaryPath << "'");
}
// remove bin/applName // remove bin/applName
baseFolderData = binaryPath; baseFolderData = binaryPath;
#if defined(__TARGET_OS__MacOs) #if defined(__TARGET_OS__MacOs)