From 544e1c2983600ecd277577140840bea962362b2d Mon Sep 17 00:00:00 2001
From: onefang
Date: Wed, 18 Aug 2021 13:21:43 +1000
Subject: Move more stuff into the var directory.

---
 OpenSim/Framework/Util.cs                              | 6 +++---
 OpenSim/Region/ScriptEngine/Shared/AssemblyResolver.cs | 2 +-
 OpenSim/Tests/Robust/Server/DemonServer.cs             | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'OpenSim')

diff --git a/OpenSim/Framework/Util.cs b/OpenSim/Framework/Util.cs
index cc449af..187ed4f 100644
--- a/OpenSim/Framework/Util.cs
+++ b/OpenSim/Framework/Util.cs
@@ -1306,12 +1306,12 @@ namespace OpenSim.Framework
 
         public static string dbDir()
         {
-            return Path.Combine("..", Path.Combine("..", "db"));
+            return Path.Combine("..", Path.Combine("..", "var/lib/db"));
         }
 
         public static string cacheDir()
         {
-            return Path.Combine("..", Path.Combine("..", "caches"));
+            return Path.Combine("..", Path.Combine("..", "var/cache"));
         }
 
         public static string configDir()
@@ -1327,7 +1327,7 @@ namespace OpenSim.Framework
 
         public static string logsDir()
         {
-            return Path.Combine("..", "logs");
+            return Path.Combine("..", "var/log");
         }
 
         public static string webDir()
diff --git a/OpenSim/Region/ScriptEngine/Shared/AssemblyResolver.cs b/OpenSim/Region/ScriptEngine/Shared/AssemblyResolver.cs
index 6c42e2e..b1c85c8 100644
--- a/OpenSim/Region/ScriptEngine/Shared/AssemblyResolver.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/AssemblyResolver.cs
@@ -44,7 +44,7 @@ namespace OpenSim.Region.ScriptEngine.Shared
             string dirName = myDomain.FriendlyName;
             string ScriptEnginesPath = myDomain.SetupInformation.PrivateBinPath;
 
-            string[] pathList = new string[] {"", "caches", ScriptEnginesPath,
+            string[] pathList = new string[] {"", "var/cache", ScriptEnginesPath,
                                               Path.Combine(ScriptEnginesPath, dirName)};
 
             string assemblyName = args.Name;
diff --git a/OpenSim/Tests/Robust/Server/DemonServer.cs b/OpenSim/Tests/Robust/Server/DemonServer.cs
index 41c2185..fa0c958 100644
--- a/OpenSim/Tests/Robust/Server/DemonServer.cs
+++ b/OpenSim/Tests/Robust/Server/DemonServer.cs
@@ -48,8 +48,8 @@ namespace Robust.Tests
         [SetUp]
         public void StartDemon()
         {
-            if (File.Exists("../../logs/Robust.Tests.log"))
-                File.Delete("../../logs/Robust.Tests.log");
+            if (File.Exists("../../var/log/Robust.Tests.log"))
+                File.Delete("../../var/log/Robust.Tests.log");
 
             Console.WriteLine("**** Starting demon Robust server ****");
             m_demon = new Thread( () => Main(new string[] {"-inifile=Robust.Tests.ini"}));
-- 
cgit v1.1