Update config file logic and unify webDir path to wwwroot

- Prevent overwriting existing config files by only copying example files if the target does not exist.
- Set webDir to "wwwroot" for all OSes for consistency.
- Update last used publish profile to SelfContained-Win-x64.
This commit is contained in:
2026-03-04 17:23:58 -05:00
parent 667c3768a9
commit 0eb44818ff
3 changed files with 5 additions and 5 deletions
@@ -338,7 +338,7 @@ namespace Emby.Server.Implementations.AppBase
} }
// Copy example to actual file only if example was just created or if we want to initialize from example // Copy example to actual file only if example was just created or if we want to initialize from example
if (exampleFileJustCreated) if (exampleFileJustCreated && !File.Exists(path))
{ {
File.Copy(examplePath, path, overwrite: false); File.Copy(examplePath, path, overwrite: false);
Logger.LogInformation("Created configuration file from example: {Path}", path); Logger.LogInformation("Created configuration file from example: {Path}", path);
+3 -3
View File
@@ -138,7 +138,7 @@ public static class StartupHelpers
cacheDir = "C:/ProgramData/jellyfin/cache"; cacheDir = "C:/ProgramData/jellyfin/cache";
logDir = "C:/ProgramData/jellyfin/log"; logDir = "C:/ProgramData/jellyfin/log";
tempDir = Path.Combine(Path.GetTempPath(), "jellyfin"); tempDir = Path.Combine(Path.GetTempPath(), "jellyfin");
webDir = "C:/ProgramData/jellyfin/wwwroot"; webDir = "wwwroot";
osComment = "Windows defaults - using C:/ProgramData/jellyfin"; osComment = "Windows defaults - using C:/ProgramData/jellyfin";
} }
else if (OperatingSystem.IsLinux()) else if (OperatingSystem.IsLinux())
@@ -149,7 +149,7 @@ public static class StartupHelpers
cacheDir = "/var/cache/jellyfin"; cacheDir = "/var/cache/jellyfin";
logDir = "/var/log/jellyfin"; logDir = "/var/log/jellyfin";
tempDir = "/var/tmp/jellyfin"; tempDir = "/var/tmp/jellyfin";
webDir = "/usr/share/jellyfin/wwwroot"; webDir = "wwwroot";
osComment = "Linux defaults - following Filesystem Hierarchy Standard (FHS)"; osComment = "Linux defaults - following Filesystem Hierarchy Standard (FHS)";
} }
else if (OperatingSystem.IsMacOS()) else if (OperatingSystem.IsMacOS())
@@ -161,7 +161,7 @@ public static class StartupHelpers
cacheDir = Path.Combine(homeDir, "Library", "Caches", "jellyfin"); cacheDir = Path.Combine(homeDir, "Library", "Caches", "jellyfin");
logDir = Path.Combine(homeDir, "Library", "Logs", "jellyfin"); logDir = Path.Combine(homeDir, "Library", "Logs", "jellyfin");
tempDir = Path.Combine(Path.GetTempPath(), "jellyfin"); tempDir = Path.Combine(Path.GetTempPath(), "jellyfin");
webDir = Path.Combine(homeDir, "Library", "Application Support", "jellyfin", "wwwroot"); webDir = "wwwroot";
osComment = "macOS defaults - using user Library paths"; osComment = "macOS defaults - using user Library paths";
} }
else else
+1 -1
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup> <PropertyGroup>
<NameOfLastUsedPublishProfile>D:\Projects\pgsql-jellyfin\Jellyfin.Server\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile> <NameOfLastUsedPublishProfile>D:\Projects\pgsql-jellyfin\Jellyfin.Server\Properties\PublishProfiles\SelfContained-Win-x64.pubxml</NameOfLastUsedPublishProfile>
</PropertyGroup> </PropertyGroup>
</Project> </Project>