Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 09:48:44 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Re-enabled overrideScriptsPathOption.

Browse source
This commit is contained in:
Penguin-Guru 2021-10-27 14:09:23 -07:00
parent daecc1563b
commit c6cb01c4b8
1 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
interface/src/main.cpp
View file

@ -176,8 +176,13 @@ int main(int argc, const char* argv[]) {
"no-launcher", "no-launcher",
"Do not execute the launcher." "Do not execute the launcher."
); );
QCommandLineOption overrideScriptsPathOption(
"overrideScriptsPath",
"Probably specifies where to look for scripts.",
"string"
);
QCommandLineOption defaultScriptOverrideOption( QCommandLineOption defaultScriptOverrideOption(
"defaultScriptsOverride", "defaultScriptOverride",
"Override defaultsScripts.js.", "Override defaultsScripts.js.",
"string" "string"
); );
@ -241,7 +246,7 @@ int main(int argc, const char* argv[]) {
parser.addOption(listenPortOption); parser.addOption(listenPortOption);
parser.addOption(serverContentPathOption); parser.addOption(serverContentPathOption);
parser.addOption(overrideAppLocalDataPathOption); parser.addOption(overrideAppLocalDataPathOption);
parser.addOption(scriptsOption); // Also known as "overrideScriptsPathOption"? parser.addOption(scriptsOption);
parser.addOption(allowMultipleInstancesOption); parser.addOption(allowMultipleInstancesOption);
parser.addOption(displaysOption); parser.addOption(displaysOption);
parser.addOption(disableDisplaysOption); parser.addOption(disableDisplaysOption);
@ -259,6 +264,7 @@ int main(int argc, const char* argv[]) {
parser.addOption(noLauncherOption); parser.addOption(noLauncherOption);
parser.addOption(responseTokensOption); parser.addOption(responseTokensOption);
parser.addOption(displayNameOption); parser.addOption(displayNameOption);
parser.addOption(overrideScriptsPathOption);
parser.addOption(defaultScriptOverrideOption); parser.addOption(defaultScriptOverrideOption);
parser.addOption(traceFileOption); parser.addOption(traceFileOption);
parser.addOption(traceDurationOption); parser.addOption(traceDurationOption);
@ -417,13 +423,12 @@ int main(int argc, const char* argv[]) {
// this needs to be done here in main, as the mechanism for setting the // this needs to be done here in main, as the mechanism for setting the
// scripts directory appears not to work. See the bug report (dead link) // scripts directory appears not to work. See the bug report (dead link)
// https://highfidelity.fogbugz.com/f/cases/5759/Issues-changing-scripts-directory-in-ScriptsEngine // https://highfidelity.fogbugz.com/f/cases/5759/Issues-changing-scripts-directory-in-ScriptsEngine
// It is currently also done in "Application.cpp". Not sure if necessary. if (parser.isSet(overrideScriptsPathOption)) {
/*if (parser.isSet(overrideScriptsPathOption)) {
QDir scriptsPath(parser.value(overrideScriptsPathOption)); QDir scriptsPath(parser.value(overrideScriptsPathOption));
if (scriptsPath.exists()) { if (scriptsPath.exists()) {
PathUtils::defaultScriptsLocation(scriptsPath.path()); PathUtils::defaultScriptsLocation(scriptsPath.path());
} }
}*/ }
if (instanceMightBeRunning) { if (instanceMightBeRunning) {
// Try to connect and send message to existing interface instance // Try to connect and send message to existing interface instance