diff options
| author | Vasily <JustAMan@users.noreply.github.com> | 2019-03-11 15:32:36 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-11 15:32:36 +0300 |
| commit | f77af5f6e4cce85a5fc638e8da20cb0d56a899da (patch) | |
| tree | a0478439af94369cf51887d6262e5fef619b1cce /Jellyfin.Server/Program.cs | |
| parent | 2324c408ba74c9230fee0dbd3bd346f22db8262b (diff) | |
| parent | 037cf9e1eeb4e500b4bdc379c76fe5a5922c7f54 (diff) | |
Merge pull request #1093 from joshuaboniface/saner-paths
Use better path configuration for packages
Diffstat (limited to 'Jellyfin.Server/Program.cs')
| -rw-r--r-- | Jellyfin.Server/Program.cs | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/Jellyfin.Server/Program.cs b/Jellyfin.Server/Program.cs index 0ef1711d4..fa4b7b8e5 100644 --- a/Jellyfin.Server/Program.cs +++ b/Jellyfin.Server/Program.cs @@ -174,7 +174,7 @@ namespace Jellyfin.Server { // dataDir // IF --datadir - // ELSE IF $JELLYFIN_DATA_PATH + // ELSE IF $JELLYFIN_DATA_DIR // ELSE IF windows, use <%APPDATA%>/jellyfin // ELSE IF $XDG_DATA_HOME then use $XDG_DATA_HOME/jellyfin // ELSE use $HOME/.local/share/jellyfin @@ -182,7 +182,7 @@ namespace Jellyfin.Server if (string.IsNullOrEmpty(dataDir)) { - dataDir = Environment.GetEnvironmentVariable("JELLYFIN_DATA_PATH"); + dataDir = Environment.GetEnvironmentVariable("JELLYFIN_DATA_DIR"); if (string.IsNullOrEmpty(dataDir)) { @@ -191,8 +191,6 @@ namespace Jellyfin.Server } } - Directory.CreateDirectory(dataDir); - // configDir // IF --configdir // ELSE IF $JELLYFIN_CONFIG_DIR @@ -285,6 +283,7 @@ namespace Jellyfin.Server // Ensure the main folders exist before we continue try { + Directory.CreateDirectory(dataDir); Directory.CreateDirectory(logDir); Directory.CreateDirectory(configDir); Directory.CreateDirectory(cacheDir); |