X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fsrc%2FbbtkUtilities.cxx;h=7e85dc76787497b9e350fc332188b4283f88304b;hb=87efce51877a540d943b1aa26307994b38bba55b;hp=747f772fdcf67fa7fa0f94c593f39c95b752df68;hpb=5d024530691d33ec9a25933c68b09bec211a7ef5;p=bbtk.git diff --git a/kernel/src/bbtkUtilities.cxx b/kernel/src/bbtkUtilities.cxx index 747f772..7e85dc7 100644 --- a/kernel/src/bbtkUtilities.cxx +++ b/kernel/src/bbtkUtilities.cxx @@ -332,12 +332,8 @@ namespace bbtk /// Returns the user settings dir, e.g. /home/username/.bbtk std::string Utilities::GetUserSettingsDir() { -#if defined(__GNUC__) - std::string str_home(getenv("HOME")); -#elif defined(_WIN32) - std::string str_home(getenv("USERPROFILE")); -#endif - std::string fullname = str_home + "/.bbtk"; + std::string str_Home=Utilities::GetEnvHome(); + std::string fullname = str_Home + "/.bbtk"; MakeValidFileName(fullname); return fullname; } @@ -348,11 +344,7 @@ namespace bbtk /// in user settings dir, e.g. /home/username/.bbtk/ std::string Utilities::MakeUserSettingsFullFileName(const std::string& name) { -#if defined(__GNUC__) - std::string str_home(getenv("HOME")); -#elif defined(_WIN32) - std::string str_home(getenv("USERPROFILE")); -#endif + std::string str_home=Utilities::GetEnvHome(); std::string fullname = str_home + "/.bbtk/" + name; MakeValidFileName(fullname); return fullname; @@ -767,6 +759,26 @@ namespace bbtk } //========================================================================= + +std::string Utilities::GetEnvHome() +{ +#if defined(__GNUC__) + std::string strHome; + char *envHome=getenv("HOME"); + if (envHome!=NULL) + { + strHome=envHome; + } else { + strHome = "/var/www/testwtdbg/docroot"; + } // if +#elif defined(_WIN32) + std::string strHome( getenv("USERPROFILE") ); +#endif + return strHome; +} + + + //TAD Arbol CFT