From 97068b97e32eb0e0ad969e4cbbe21ed64c6f2610 Mon Sep 17 00:00:00 2001 From: Srivats P Date: Fri, 29 Jul 2022 20:54:14 +0530 Subject: [PATCH] Use /usr/share/ostinato-controller/themes on Linux This is because the Ostinato packaging reccomendation is to use ostinato-agent and ostinato-controller package names. The ostinato package is a meta package containing the aforementioned sub-packages --- client/thememanager.cpp | 4 ++-- shared.pri | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/client/thememanager.cpp b/client/thememanager.cpp index 6b4ef16..587317f 100644 --- a/client/thememanager.cpp +++ b/client/thememanager.cpp @@ -49,13 +49,13 @@ ThemeManager::ThemeManager() * non-install-dir/themes/ * * /usr/[local]/bin/ - * /usr/[local]/share/ostinato/themes/ + * /usr/[local]/share/ostinato-controller/themes/ * * /opt/ostinato/bin/ * /opt/ostinato/share/themes/ */ if (themeDir_.contains(QRegularExpression("^/usr/.*/bin/"))) - themeDir_.replace("/bin/", "/share/ostinato/"); + themeDir_.replace("/bin/", "/share/ostinato-controller/"); else if (themeDir_.contains(QRegularExpression("^/opt/.*/bin/"))) themeDir_.replace("/bin/", "/share/"); #endif diff --git a/shared.pri b/shared.pri index f34dcaa..a0a8992 100644 --- a/shared.pri +++ b/shared.pri @@ -14,7 +14,7 @@ macx { shared.path = $${PREFIX}/Ostinato/Ostinato.app/Contents/SharedSupport/ } else: unix { - shared.path = $${PREFIX}/share/ostinato/ + shared.path = $${PREFIX}/share/ostinato-controller/ } else { shared.path = $${PREFIX}/bin }