epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #12828 from Phrohdoh/util-engine-mod-search-paths

Browse Source 
Utility and server: Get mod search paths from env MOD_SEARCH_PATHS
This commit is contained in:
Oliver Brakmann
2017-04-14 21:59:09 +02:00
committed by GitHub
parent 9637e1b2c7 4d5f9e0de7
commit 63e4fbc5ad
2 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
OpenRA.Server/Program.cs
View File

@@ -11,6 +11,7 @@
using System;
using System.IO;
using System.Linq;
using System.Net;
using System.Threading;
using OpenRA.Support;
@@ -42,8 +43,12 @@ namespace OpenRA.Server
Game.InitializeSettings(arguments);
var settings = Game.Settings.Server;
var envModSearchPaths = Environment.GetEnvironmentVariable("MOD_SEARCH_PATHS");
var modSearchPaths = !string.IsNullOrWhiteSpace(envModSearchPaths) ?
FieldLoader.GetValue<string[]>("MOD_SEARCH_PATHS", envModSearchPaths) :
new[] { Path.Combine(".", "mods"), Path.Combine("^", "mods") };
var mod = Game.Settings.Game.Mod;
var modSearchPaths = new[] { Path.Combine(".", "mods"), Path.Combine("^", "mods") };
var mods = new InstalledMods(modSearchPaths, explicitModPaths);
// HACK: The engine code *still* assumes that Game.ModData is set

6
OpenRA.Utility/Program.cs
View File

@@ -45,7 +45,11 @@ namespace OpenRA
Game.InitializeSettings(Arguments.Empty);
var modSearchPaths = new[] { Path.Combine(".", "mods"), Path.Combine("^", "mods") };
var envModSearchPaths = Environment.GetEnvironmentVariable("MOD_SEARCH_PATHS");
var modSearchPaths = !string.IsNullOrWhiteSpace(envModSearchPaths) ?
FieldLoader.GetValue<string[]>("MOD_SEARCH_PATHS", envModSearchPaths) :
new[] { Path.Combine(".", "mods"), Path.Combine("^", "mods") };
if (args.Length == 0)
{
PrintUsage(new InstalledMods(modSearchPaths, new string[0]), null);