blumia/dde-application-manager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refact: guarantee XDG_CONFIG_HOME is first element

Browse Source 
and ensure that config dirs only has an XDG_CONFIG_HOME

Signed-off-by: ComixHe <heyuming@deepin.org>
This commit is contained in:
ComixHe 2023-09-11 13:09:37 +08:00 committed by Comix
parent 3f38233306
commit 98ef11dc27
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/global.h
View File

@ -395,14 +395,15 @@ inline QStringList getAutoStartDirs()
XDGConfigDirs.append("/etc/xdg"); XDGConfigDirs.append("/etc/xdg");
} }
// FIXME: What if XDG_CONFIG_HOME already in XDG_CONFIG_DIRS?
auto XDGConfigHome = QString::fromLocal8Bit(qgetenv("XDG_CONFIG_HOME")); auto XDGConfigHome = QString::fromLocal8Bit(qgetenv("XDG_CONFIG_HOME"));
if (XDGConfigHome.isEmpty()) { if (XDGConfigHome.isEmpty()) {
XDGConfigHome = QString::fromLocal8Bit(qgetenv("HOME")) + QDir::separator() + ".config"; XDGConfigHome = QString::fromLocal8Bit(qgetenv("HOME")) + QDir::separator() + ".config";
} }
XDGConfigDirs.push_front(std::move(XDGConfigHome)); if (XDGConfigDirs.constFirst() != XDGConfigHome) {
XDGConfigDirs.removeAll(XDGConfigHome);
XDGConfigDirs.push_front(std::move(XDGConfigHome)); // guarantee XDG_CONFIG_HOME is first element.
}
std::for_each(XDGConfigDirs.begin(), XDGConfigDirs.end(), [](QString &str) { std::for_each(XDGConfigDirs.begin(), XDGConfigDirs.end(), [](QString &str) {
if (!str.endsWith(QDir::separator())) { if (!str.endsWith(QDir::separator())) {