From da3d78de436dcf625c19657c75b53407b64beca1 Mon Sep 17 00:00:00 2001 From: David Hill Date: Wed, 7 Nov 2018 12:49:51 -0600 Subject: [PATCH] change to get tmp from config --- utils/startup/installdir.cpp | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/utils/startup/installdir.cpp b/utils/startup/installdir.cpp index f17740ca2..6b663fcb5 100644 --- a/utils/startup/installdir.cpp +++ b/utils/startup/installdir.cpp @@ -101,7 +101,7 @@ const string StartUp::tmpDir() #else //check for non-root user - const char* p = getenv("HOME"); +/* const char* p = getenv("HOME"); string homedir = p; if (homedir == "/root") @@ -128,9 +128,23 @@ const string StartUp::tmpDir() *fTmpDirp = *fTmpDirp + "/.tmp"; } +*/ + Config* sysConfig = Config::makeConfig(); + + string TempFileDir; + + try + { + TempFileDir = sysConfig->getConfig("SystemConfig", "SystemTempFileDir"); + } + catch (...) + {} + + *fTmpDirp = TempFileDir; #endif + return *fTmpDirp; }