Posix: use /etc/dub/settings.json if in /usr

Fix #1472 /etc/dub/settings.json overrides /usr/etc/dub/settings.json (as suggested by the `man hier` manpage)
dlang · Feb 16, 2022 · 8d22ca4 · 8d22ca4
1 parent c2c6735
commit 8d22ca4
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/source/dub/dub.d b/source/dub/dub.d
@@ -290,7 +290,15 @@ class Dub {
 		m_dirs.temp = NativePath(tempDir);
 
 		m_config = new DubConfig(jsonFromFile(m_dirs.systemSettings ~ "settings.json", true), m_config);
-		m_config = new DubConfig(jsonFromFile(NativePath(thisExePath).parentPath ~ "../etc/dub/settings.json", true), m_config);
+
+		auto dubFolderPath = NativePath(thisExePath).parentPath;
+		m_config = new DubConfig(jsonFromFile(dubFolderPath ~ "../etc/dub/settings.json", true), m_config);
+		version (Posix) {
+			if (dubFolderPath.absolute && dubFolderPath.startsWith(NativePath("usr"))) {
+				m_config = new DubConfig(jsonFromFile(NativePath("/etc/dub/settings.json"), true), m_config);
+			}
+		}
+
 		m_config = new DubConfig(jsonFromFile(m_dirs.userSettings ~ "settings.json", true), m_config);
 
 		if (!root_path.empty)