control Prism data directory via env variable
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
This commit is contained in:
parent
196b2b5a3e
commit
7a0b299be9
2 changed files with 16 additions and 1 deletions
|
@ -292,12 +292,17 @@ Application::Application(int& argc, char** argv) : QApplication(argc, argv)
|
|||
QString adjustedBy;
|
||||
QString dataPath;
|
||||
// change folder
|
||||
QString dataDirEnv;
|
||||
QString dirParam = parser.value("dir");
|
||||
if (!dirParam.isEmpty()) {
|
||||
// the dir param. it makes multimc data path point to whatever the user specified
|
||||
// on command line
|
||||
adjustedBy = "Command line";
|
||||
dataPath = dirParam;
|
||||
} else if (dataDirEnv = QProcessEnvironment::systemEnvironment().value(QString("%1_DATA_DIR").arg(BuildConfig.LAUNCHER_NAME.toUpper()));
|
||||
!dataDirEnv.isEmpty()) {
|
||||
adjustedBy = "System environment";
|
||||
dataPath = dataDirEnv;
|
||||
} else {
|
||||
QDir foo;
|
||||
if (DesktopServices::isSnap()) {
|
||||
|
@ -443,7 +448,7 @@ Application::Application(int& argc, char** argv) : QApplication(argc, argv)
|
|||
|
||||
// search the dataPath()
|
||||
// seach app data standard path
|
||||
if (!foundLoggingRules && !isPortable() && dirParam.isEmpty()) {
|
||||
if (!foundLoggingRules && !isPortable() && dirParam.isEmpty() && dataDirEnv.isEmpty()) {
|
||||
logRulesPath = QStandardPaths::locate(QStandardPaths::AppDataLocation, FS::PathCombine("..", logRulesFile));
|
||||
if (!logRulesPath.isEmpty()) {
|
||||
qDebug() << "Found" << logRulesPath << "...";
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue