From c6cb01c4b89dfac5a28d143ad9a8726395e7cb34 Mon Sep 17 00:00:00 2001
From: Penguin-Guru <Penguin-Guru@ProtonMail.com>
Date: Wed, 27 Oct 2021 14:09:23 -0700
Subject: [PATCH] Re-enabled overrideScriptsPathOption.

---
 interface/src/main.cpp | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/interface/src/main.cpp b/interface/src/main.cpp
index 4230a32f83..78b12993b3 100644
--- a/interface/src/main.cpp
+++ b/interface/src/main.cpp
@@ -176,8 +176,13 @@ int main(int argc, const char* argv[]) {
        "no-launcher",
        "Do not execute the launcher."
     );
+    QCommandLineOption overrideScriptsPathOption(
+       "overrideScriptsPath",
+       "Probably specifies where to look for scripts.",
+       "string"
+    );
     QCommandLineOption defaultScriptOverrideOption(
-       "defaultScriptsOverride",
+       "defaultScriptOverride",
        "Override defaultsScripts.js.",
        "string"
     );
@@ -241,7 +246,7 @@ int main(int argc, const char* argv[]) {
     parser.addOption(listenPortOption);
     parser.addOption(serverContentPathOption);
     parser.addOption(overrideAppLocalDataPathOption);
-    parser.addOption(scriptsOption); // Also known as "overrideScriptsPathOption"?
+    parser.addOption(scriptsOption);
     parser.addOption(allowMultipleInstancesOption);
     parser.addOption(displaysOption);
     parser.addOption(disableDisplaysOption);
@@ -259,6 +264,7 @@ int main(int argc, const char* argv[]) {
     parser.addOption(noLauncherOption);
     parser.addOption(responseTokensOption);
     parser.addOption(displayNameOption);
+    parser.addOption(overrideScriptsPathOption);
     parser.addOption(defaultScriptOverrideOption);
     parser.addOption(traceFileOption);
     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
     // 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
-    // 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));
         if (scriptsPath.exists()) {
             PathUtils::defaultScriptsLocation(scriptsPath.path());
         }
-    }*/
+    }
 
     if (instanceMightBeRunning) {
         // Try to connect and send message to existing interface instance