notfire/Iceshrimp.NET
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[backend/startup] Set content root path to assembly directory

Browse source
This commit is contained in:
Laura Hausmann 2024-09-13 17:15:36 +02:00
parent 2e42a3ba10
commit 0d7532cb08
No known key found for this signature in database
GPG key ID: D044E84C5BE01605
2 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
Iceshrimp.Backend/Core/Helpers/StartupHelpers.cs
View file

@ -1,8 +1,10 @@
using System.Reflection;
namespace Iceshrimp.Backend.Core.Helpers; namespace Iceshrimp.Backend.Core.Helpers;
public static class StartupHelpers public static class StartupHelpers
{ {
public static void ParseCliArguments(string[] args) public static WebApplicationOptions ParseCliArguments(string[] args)
{ {
if (args.Contains("-h") || args.Contains("--help") || args.Contains("-?")) if (args.Contains("-h") || args.Contains("--help") || args.Contains("-?"))
{ {
@ -30,5 +32,8 @@ public static class StartupHelpers
Console.WriteLine(config); Console.WriteLine(config);
Environment.Exit(0); Environment.Exit(0);
} }
var contentRoot = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location);
return new WebApplicationOptions { Args = args, ContentRootPath = contentRoot };
} }
} }

5
Iceshrimp.Backend/Startup.cs
View file

@ -3,9 +3,8 @@ using Iceshrimp.Backend.Core.Helpers;
using Iceshrimp.Backend.SignalR; using Iceshrimp.Backend.SignalR;
using Iceshrimp.Backend.SignalR.Authentication; using Iceshrimp.Backend.SignalR.Authentication;
StartupHelpers.ParseCliArguments(args); var options = StartupHelpers.ParseCliArguments(args);
var builder = WebApplication.CreateBuilder(options);
var builder = WebApplication.CreateBuilder(args);
builder.Configuration.Sources.Clear(); builder.Configuration.Sources.Clear();
builder.Configuration.AddCustomConfiguration(); builder.Configuration.AddCustomConfiguration();