1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
|
From: =?utf-8?q?Sandro_Knau=C3=9F?= <hefee@debian.org>
Date: Mon, 19 Apr 2021 18:54:56 +0200
Subject: Move configuration dir
Origin: Debian
Last-Update: 2015-03-22
At debian we expect config files in an dir that is the same like
the packagename, so make sure this is also used.
Last-Update: 2015-03-22
---
CMakeLists.txt | 2 +-
src/libsync/configfile.cpp | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8fc7670..a25c1ed 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -144,7 +144,7 @@ else()
if(WIN32)
install(FILES "${EXCLUDE_FILE_NAME}" DESTINATION bin)
else()
- install(FILES "${EXCLUDE_FILE_NAME}" DESTINATION ${KDE_INSTALL_SYSCONFDIR}/${APPLICATION_SHORTNAME})
+ install(FILES "${EXCLUDE_FILE_NAME}" DESTINATION ${SYSCONFDIR}/${APPLICATION_SHORTNAME}-client)
endif()
endif()
diff --git a/src/libsync/configfile.cpp b/src/libsync/configfile.cpp
index 7fa4b75..c52736b 100644
--- a/src/libsync/configfile.cpp
+++ b/src/libsync/configfile.cpp
@@ -314,7 +314,7 @@ QString ConfigFile::excludeFileFromSystem()
fi.setFile(QCoreApplication::applicationDirPath(), excludeFileNameC());
#endif
#ifdef Q_OS_UNIX
- fi.setFile(QStringLiteral(SYSCONFDIR "/%1").arg(Theme::instance()->appName()), excludeFileNameC());
+ fi.setFile(QStringLiteral(SYSCONFDIR "/%1-client").arg(Theme::instance()->appName()), excludeFileNameC());
if (!fi.exists()) {
// Prefer to return the preferred path! Only use the fallback location
// if the other path does not exist and the fallback is valid.
@@ -599,7 +599,7 @@ QVariant ConfigFile::getValue(const QString ¶m, const QString &group,
}
systemSetting = systemSettings.value(param, defaultValue);
} else if (Utility::isUnix()) {
- QSettings systemSettings(QStringLiteral(SYSCONFDIR "/%1/%1.conf").arg(Theme::instance()->appName()), QSettings::NativeFormat);
+ QSettings systemSettings(QStringLiteral(SYSCONFDIR "/%1-client/%1.conf").arg(Theme::instance()->appName()), QSettings::NativeFormat);
if (!group.isEmpty()) {
systemSettings.beginGroup(group);
}
|
