Muldersoft/MUtilities
Muldersoft/MUtilities
1
0
Fork 0
Code Releases Activity

Small improvement to init_process() function.

Browse Source
This commit is contained in:
LoRd_MuldeR 2018-10-22 23:09:52 +02:00
parent 8fa44842da
commit 89b73b90c9
2 changed files with 31 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/Global.cpp
View File

@ -540,34 +540,50 @@ static void prependToPath(QProcessEnvironment &env, const QString &value)
void MUtils::init_process(QProcess &process, const QString &wokringDir, const bool bReplaceTempDir, const QStringList *const extraPaths, const QHash<QString, QString> *const extraEnv) void MUtils::init_process(QProcess &process, const QString &wokringDir, const bool bReplaceTempDir, const QStringList *const extraPaths, const QHash<QString, QString> *const extraEnv)
{ {
//Environment variable names //Environment variable names
static const char *const s_envvar_names_temp[] = static const char *const ENVVAR_NAMES_TMP[] =
{ {
"TEMP", "TMP", "TMPDIR", "HOME", "USERPROFILE", "HOMEPATH", NULL "TEMP", "TMP", "TMPDIR", "HOME", "USERPROFILE", "HOMEPATH", NULL
}; };
static const char *const s_envvar_names_remove[] = static const char *const ENVVAR_NAMES_SYS[] =
{ {
"WGETRC", "SYSTEM_WGETRC", "HTTP_PROXY", "FTP_PROXY", "NO_PROXY", "GNUPGHOME", "LC_ALL", "LC_COLLATE", "LC_CTYPE", "LC_MESSAGES", "LC_MONETARY", "LC_NUMERIC", "LC_TIME", "LANG", NULL "WINDIR", "SYSTEMROOT", NULL
};
static const char *const ENVVAR_NAMES_DEL[] =
{
"HTTP_PROXY", "FTP_PROXY", "NO_PROXY", "HOME", "LC_ALL", "LC_COLLATE", "LC_CTYPE",
"LC_MESSAGES", "LC_MONETARY", "LC_NUMERIC", "LC_TIME", "LANG", NULL
}; };
//Initialize environment //Initialize environment
QProcessEnvironment env = process.processEnvironment(); QProcessEnvironment env = process.processEnvironment();
if(env.isEmpty()) env = QProcessEnvironment::systemEnvironment(); if (env.isEmpty())
//Clean a number of enviroment variables that might affect our tools
for(size_t i = 0; s_envvar_names_remove[i]; i++)
{ {
env.remove(QString::fromLatin1(s_envvar_names_remove[i])); env = QProcessEnvironment::systemEnvironment();
env.remove(QString::fromLatin1(s_envvar_names_remove[i]).toLower());
} }
const QString tempDir = QDir::toNativeSeparators(temp_folder()); //Clean enviroment variables that might affect our tools
for(const char *const *ptr = ENVVAR_NAMES_DEL; *ptr; ++ptr)
{
env.remove(QString::fromLatin1(*ptr));
}
//Set up system root directory
const QString sysRoot = QDir::toNativeSeparators(OS::known_folder(OS::FOLDER_SYSTROOT_DIR));
if (!sysRoot.isEmpty())
{
for (const char *const *ptr = ENVVAR_NAMES_SYS; *ptr; ++ptr)
{
env.insert(QString::fromLatin1(*ptr), sysRoot);
}
}
//Replace TEMP directory in environment //Replace TEMP directory in environment
const QString tempDir = QDir::toNativeSeparators(temp_folder());
if(bReplaceTempDir) if(bReplaceTempDir)
{ {
for(size_t i = 0; s_envvar_names_temp[i]; i++) for (const char *const *ptr = ENVVAR_NAMES_TMP; *ptr; ++ptr)
{ {
env.insert(s_envvar_names_temp[i], tempDir); env.insert(QString::fromLatin1(*ptr), tempDir);
} }
} }

4
src/UpdateChecker.cpp
View File

@ -104,8 +104,10 @@ static QQueue<QString> buildRandomList(const char *const *values)
static const QHash<QString, QString> *initEnvVars(void) static const QHash<QString, QString> *initEnvVars(void)
{ {
const QString tempfolder = QDir::toNativeSeparators(MUtils::temp_folder());
QHash<QString, QString> *const environment = new QHash<QString, QString>(); QHash<QString, QString> *const environment = new QHash<QString, QString>();
environment->insert(QLatin1String("CURL_HOME"), QDir::toNativeSeparators(MUtils::temp_folder())); environment->insert(QLatin1String("CURL_HOME"), tempfolder);
environment->insert(QLatin1String("GNUPGHOME"), tempfolder);
return environment; return environment;
} }