From 0f288247a7dd7d0104fc64a41697b4a3d3781202 Mon Sep 17 00:00:00 2001
From: Seth Alves <seth.alves@gmail.com>
Date: Fri, 1 Apr 2016 10:50:22 -0700
Subject: [PATCH] include script in default script location

---
 libraries/script-engine/src/ScriptEngines.cpp | 2 +-
 libraries/script-engine/src/ScriptsModel.cpp  | 6 ++----
 libraries/shared/src/PathUtils.cpp            | 6 +++---
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/libraries/script-engine/src/ScriptEngines.cpp b/libraries/script-engine/src/ScriptEngines.cpp
index f22d048661..04a772cf77 100644
--- a/libraries/script-engine/src/ScriptEngines.cpp
+++ b/libraries/script-engine/src/ScriptEngines.cpp
@@ -251,7 +251,7 @@ static const QString SETTINGS_KEY = "Settings";
 
 void ScriptEngines::loadDefaultScripts() {
     QUrl defaultScriptsLoc = defaultScriptsLocation();
-    defaultScriptsLoc.setPath(defaultScriptsLoc.path() + "/scripts/defaultScripts.js");
+    defaultScriptsLoc.setPath(defaultScriptsLoc.path() + "/defaultScripts.js");
     loadScript(defaultScriptsLoc.toString());
 }
 
diff --git a/libraries/script-engine/src/ScriptsModel.cpp b/libraries/script-engine/src/ScriptsModel.cpp
index 0c58966e81..b9fb73c037 100644
--- a/libraries/script-engine/src/ScriptsModel.cpp
+++ b/libraries/script-engine/src/ScriptsModel.cpp
@@ -25,7 +25,6 @@
 #define __STR1__(x) __STR2__(x)
 #define __LOC__ __FILE__ "(" __STR1__(__LINE__) ") : Warning Msg: "
 
-static const QString MODELS_LOCATION = "scripts/";
 static const QString PREFIX_PARAMETER_NAME = "prefix";
 static const QString MARKER_PARAMETER_NAME = "marker";
 static const QString IS_TRUNCATED_NAME = "IsTruncated";
@@ -159,8 +158,7 @@ void ScriptsModel::requestDefaultFiles(QString marker) {
 
     if (url.isLocalFile()) {
         // if the url indicates a local directory, use QDirIterator
-        // QString localDir = url.toLocalFile() + "/scripts";
-        QString localDir = expandScriptUrl(url).toLocalFile() + "/scripts";
+        QString localDir = expandScriptUrl(url).toLocalFile();
         int localDirPartCount = localDir.split("/").size();
         #ifdef Q_OS_WIN
         localDirPartCount++; // one for the drive letter
@@ -176,7 +174,7 @@ void ScriptsModel::requestDefaultFiles(QString marker) {
     } else {
         // the url indicates http(s), use QNetworkRequest
         QUrlQuery query;
-        query.addQueryItem(PREFIX_PARAMETER_NAME, MODELS_LOCATION);
+        query.addQueryItem(PREFIX_PARAMETER_NAME, ".");
         if (!marker.isEmpty()) {
             query.addQueryItem(MARKER_PARAMETER_NAME, marker);
         }
diff --git a/libraries/shared/src/PathUtils.cpp b/libraries/shared/src/PathUtils.cpp
index 410a95a4d5..025768908c 100644
--- a/libraries/shared/src/PathUtils.cpp
+++ b/libraries/shared/src/PathUtils.cpp
@@ -57,11 +57,11 @@ QString findMostRecentFileExtension(const QString& originalFileName, QVector<QSt
 
 QUrl defaultScriptsLocation() {
 #ifdef Q_OS_WIN
-    return QUrl(("file:///" + QCoreApplication::applicationDirPath()).toLower());
+    return QUrl(("file:///" + QCoreApplication::applicationDirPath()).toLower() + "/scripts");
 #elif defined(Q_OS_OSX)
-    return QUrl(("file://" + QCoreApplication::applicationDirPath() + "/../Resources").toLower());
+    return QUrl(("file://" + QCoreApplication::applicationDirPath() + "/../Resources/scripts").toLower());
 #else
     // return "http://s3.amazonaws.com/hifi-public";
-    return QUrl("file://" + QCoreApplication::applicationDirPath());
+    return QUrl("file://" + QCoreApplication::applicationDirPath() + "/scripts");
 #endif
 }