forks
/
D-Scanner
mirror of https://github.com/dlang-community/D-Scanner.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #582 from wilzbach/window-config-file 

Fix #268 - Use the User's profile directory under Windows
merged-on-behalf-of: Brian Schott <Hackerpilot@users.noreply.github.com>
This commit is contained in:
The Dlang Bot 2018-04-03 09:48:08 +02:00 committed by GitHub
parent 68a1fac12b 75274faedb
commit a619e6bba0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/dscanner/main.d
View File

@ -407,24 +407,28 @@ version (OSX) version = useXDG;
*/ */
string getDefaultConfigurationLocation() string getDefaultConfigurationLocation()
{ {
import std.process : environment;
import std.exception : enforce;
version (useXDG) version (useXDG)
{ {
import std.process : environment;
string configDir = environment.get("XDG_CONFIG_HOME", null); string configDir = environment.get("XDG_CONFIG_HOME", null);
if (configDir is null) if (configDir is null)
{ {
configDir = environment.get("HOME", null); configDir = environment.get("HOME", null);
if (configDir is null) enforce(configDir !is null, "Both $XDG_CONFIG_HOME and $HOME are unset");
throw new Exception("Both $XDG_CONFIG_HOME and $HOME are unset");
configDir = buildPath(configDir, ".config", "dscanner", CONFIG_FILE_NAME); configDir = buildPath(configDir, ".config", "dscanner", CONFIG_FILE_NAME);
} }
else else
configDir = buildPath(configDir, "dscanner", CONFIG_FILE_NAME); configDir = buildPath(configDir, "dscanner", CONFIG_FILE_NAME);
return configDir; return configDir;
} }
else version (Windows) else version(Windows)
return CONFIG_FILE_NAME; {
string configDir = environment.get("APPDATA", null);
enforce(configDir !is null, "%APPDATA% is unset");
configDir = buildPath(configDir, "dscanner", CONFIG_FILE_NAME);
return configDir;
}
} }
/** /**