diff options
| author | Bond_009 <bond.009@outlook.com> | 2019-02-01 18:15:35 +0100 |
|---|---|---|
| committer | Bond_009 <bond.009@outlook.com> | 2019-02-01 18:17:43 +0100 |
| commit | 660f6174b32268edf7b9bdb4441eef83b187daaf (patch) | |
| tree | c03e38772c1788ad0d650c04f2a420c6431b7100 | |
| parent | 8af1e93cd4c9187ec46e2a6c7002791190be13fc (diff) | |
Rebase on master
| -rw-r--r-- | Jellyfin.Server/Program.cs | 4 | ||||
| -rw-r--r-- | Jellyfin.Server/StartupOptions.cs | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/Jellyfin.Server/Program.cs b/Jellyfin.Server/Program.cs index e0d5ed623..5c8608a92 100644 --- a/Jellyfin.Server/Program.cs +++ b/Jellyfin.Server/Program.cs @@ -205,9 +205,9 @@ namespace Jellyfin.Server string cacheDir = Environment.GetEnvironmentVariable("JELLYFIN_CACHE_DIR"); if (string.IsNullOrEmpty(cacheDir)) { - if (options.ContainsOption("-cachedir")) + if (options.CacheDir != null) { - cacheDir = options.GetOption("-cachedir"); + cacheDir = options.CacheDir; } else if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) { diff --git a/Jellyfin.Server/StartupOptions.cs b/Jellyfin.Server/StartupOptions.cs index 6e6b61725..4908d86ed 100644 --- a/Jellyfin.Server/StartupOptions.cs +++ b/Jellyfin.Server/StartupOptions.cs @@ -11,6 +11,9 @@ namespace Jellyfin.Server [Option('d', "datadir", Required = false, HelpText = "Path to use for the data folder (database files, etc.).")] public string DataDir { get; set; } + [Option('C', "configdir", Required = false, HelpText = "Path to use for caching.")] + public string CacheDir { get; set; } + [Option('c', "configdir", Required = false, HelpText = "Path to use for configuration data (user settings and pictures).")] public string ConfigDir { get; set; } |