From a5eb54b1b7eaf7ac3d5612956a74bdbeb12f2704 Mon Sep 17 00:00:00 2001 From: Ryan Huffman Date: Fri, 15 Jan 2016 10:36:09 -0800 Subject: [PATCH] Move DomainServer script location to app data directory --- domain-server/src/DomainServer.cpp | 3 ++- libraries/networking/src/Assignment.cpp | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/domain-server/src/DomainServer.cpp b/domain-server/src/DomainServer.cpp index 614b90cb18..28e9fd696d 100644 --- a/domain-server/src/DomainServer.cpp +++ b/domain-server/src/DomainServer.cpp @@ -35,6 +35,7 @@ #include #include #include +#include #include "DomainServerNodeData.h" #include "NodeConnectionData.h" @@ -1068,7 +1069,7 @@ QJsonObject DomainServer::jsonObjectForNode(const SharedNodePointer& node) { const char ASSIGNMENT_SCRIPT_HOST_LOCATION[] = "resources/web/assignment"; QString pathForAssignmentScript(const QUuid& assignmentUUID) { - QString newPath(ASSIGNMENT_SCRIPT_HOST_LOCATION); + QString newPath { ServerPathUtils::getDataDirectory() + "/" + QString(ASSIGNMENT_SCRIPT_HOST_LOCATION) }; newPath += "/scripts/"; // append the UUID for this script as the new filename, remove the curly braces newPath += uuidStringWithoutCurlyBraces(assignmentUUID); diff --git a/libraries/networking/src/Assignment.cpp b/libraries/networking/src/Assignment.cpp index e6163c776b..cf40400aa8 100644 --- a/libraries/networking/src/Assignment.cpp +++ b/libraries/networking/src/Assignment.cpp @@ -12,11 +12,13 @@ #include "udt/PacketHeaders.h" #include "SharedUtil.h" #include "UUID.h" +#include "ServerPathUtils.h" #include #include #include "Assignment.h" +#include Assignment::Type Assignment::typeForNodeType(NodeType_t nodeType) { switch (nodeType) {