From 0d7532cb085a1a5143f1e20fda64f297169cce37 Mon Sep 17 00:00:00 2001 From: Laura Hausmann Date: Fri, 13 Sep 2024 17:15:36 +0200 Subject: [PATCH] [backend/startup] Set content root path to assembly directory --- Iceshrimp.Backend/Core/Helpers/StartupHelpers.cs | 7 ++++++- Iceshrimp.Backend/Startup.cs | 5 ++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/Iceshrimp.Backend/Core/Helpers/StartupHelpers.cs b/Iceshrimp.Backend/Core/Helpers/StartupHelpers.cs index 0dbda91f..193c0dbc 100644 --- a/Iceshrimp.Backend/Core/Helpers/StartupHelpers.cs +++ b/Iceshrimp.Backend/Core/Helpers/StartupHelpers.cs @@ -1,8 +1,10 @@ +using System.Reflection; + namespace Iceshrimp.Backend.Core.Helpers; 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("-?")) { @@ -30,5 +32,8 @@ public static class StartupHelpers Console.WriteLine(config); Environment.Exit(0); } + + var contentRoot = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location); + return new WebApplicationOptions { Args = args, ContentRootPath = contentRoot }; } } \ No newline at end of file diff --git a/Iceshrimp.Backend/Startup.cs b/Iceshrimp.Backend/Startup.cs index 7a60bc36..10b81e7b 100644 --- a/Iceshrimp.Backend/Startup.cs +++ b/Iceshrimp.Backend/Startup.cs @@ -3,9 +3,8 @@ using Iceshrimp.Backend.Core.Helpers; using Iceshrimp.Backend.SignalR; using Iceshrimp.Backend.SignalR.Authentication; -StartupHelpers.ParseCliArguments(args); - -var builder = WebApplication.CreateBuilder(args); +var options = StartupHelpers.ParseCliArguments(args); +var builder = WebApplication.CreateBuilder(options); builder.Configuration.Sources.Clear(); builder.Configuration.AddCustomConfiguration();