Rebase on master

This commit is contained in:
Bond_009 2019-02-01 18:15:35 +01:00
parent 8af1e93cd4
commit 660f6174b3
2 changed files with 5 additions and 2 deletions

View File

@ -205,9 +205,9 @@ namespace Jellyfin.Server
string cacheDir = Environment.GetEnvironmentVariable("JELLYFIN_CACHE_DIR"); string cacheDir = Environment.GetEnvironmentVariable("JELLYFIN_CACHE_DIR");
if (string.IsNullOrEmpty(cacheDir)) 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)) else if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
{ {

View File

@ -11,6 +11,9 @@ namespace Jellyfin.Server
[Option('d', "datadir", Required = false, HelpText = "Path to use for the data folder (database files, etc.).")] [Option('d', "datadir", Required = false, HelpText = "Path to use for the data folder (database files, etc.).")]
public string DataDir { get; set; } 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).")] [Option('c', "configdir", Required = false, HelpText = "Path to use for configuration data (user settings and pictures).")]
public string ConfigDir { get; set; } public string ConfigDir { get; set; }