joerg/content
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

implement XDG config home

Browse source
This commit is contained in:
Jörg Prante 2021-01-21 16:04:11 +01:00
parent 040faea906
commit 0e44a91c37
2 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
content-config/src/main/java/org/xbib/content/config/ConfigLoader.java
View file

@ -125,13 +125,17 @@ public class ConfigLoader {
} }
private static List<String> createListOfLocations(String applicationName, String fileNameWithoutSuffix) { private static List<String> createListOfLocations(String applicationName, String fileNameWithoutSuffix) {
String xdgConfigHome = System.getenv("XDG_CONFIG_HOME");
if (xdgConfigHome == null) {
xdgConfigHome = System.getProperty("user.home") + "/.config";
}
return List.of( return List.of(
applicationName + '-' + fileNameWithoutSuffix + YML, applicationName + '-' + fileNameWithoutSuffix + YML,
applicationName + '-' + fileNameWithoutSuffix + YAML, applicationName + '-' + fileNameWithoutSuffix + YAML,
applicationName + '-' + fileNameWithoutSuffix + JSON, applicationName + '-' + fileNameWithoutSuffix + JSON,
System.getProperty("user.home") + "/." + applicationName + '/' + fileNameWithoutSuffix + YML, xdgConfigHome + '/' + applicationName + '/' + fileNameWithoutSuffix + YML,
System.getProperty("user.home") + "/." + applicationName + '/' + fileNameWithoutSuffix + YAML, xdgConfigHome + '/' + applicationName + '/' + fileNameWithoutSuffix + YAML,
System.getProperty("user.home") + "/." + applicationName + '/' + fileNameWithoutSuffix + JSON, xdgConfigHome + '/' + applicationName + '/' + fileNameWithoutSuffix + JSON,
"/etc/" + applicationName + '/' + fileNameWithoutSuffix + YML, "/etc/" + applicationName + '/' + fileNameWithoutSuffix + YML,
"/etc/" + applicationName + '/' + fileNameWithoutSuffix + YAML, "/etc/" + applicationName + '/' + fileNameWithoutSuffix + YAML,
"/etc/" + applicationName + '/' + fileNameWithoutSuffix + JSON); "/etc/" + applicationName + '/' + fileNameWithoutSuffix + JSON);

2
gradle.properties
View file

@ -1,6 +1,6 @@
group = org.xbib group = org.xbib
name = content name = content
version = 2.6.1 version = 2.6.2
gradle.wrapper.version = 6.6.1 gradle.wrapper.version = 6.6.1
xbib.net.version = 2.1.0 xbib.net.version = 2.1.0