diff options
| author | seth <getchoo@tuta.io> | 2022-10-21 19:54:10 -0400 |
|---|---|---|
| committer | seth <getchoo@tuta.io> | 2022-10-21 21:40:20 -0400 |
| commit | ba4af1a890f3d2990d86a36a2fbbb16ad2c774cf (patch) | |
| tree | 2b738c6746e8decec467c248404633834ac7c1b5 | |
| parent | 7a8c9637225f457d4648a00ff7d8031acd403730 (diff) | |
| download | PrismLauncher-ba4af1a890f3d2990d86a36a2fbbb16ad2c774cf.tar.gz PrismLauncher-ba4af1a890f3d2990d86a36a2fbbb16ad2c774cf.tar.bz2 PrismLauncher-ba4af1a890f3d2990d86a36a2fbbb16ad2c774cf.zip | |
fix: make jars path specific to prism
Signed-off-by: seth <getchoo@tuta.io>
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | launcher/Application.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 131d3e53..97bad31b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -249,7 +249,7 @@ if(UNIX AND APPLE) elseif(UNIX) set(BINARY_DEST_DIR "bin") set(LIBRARY_DEST_DIR "lib${LIB_SUFFIX}") - set(JARS_DEST_DIR "share/jars") + set(JARS_DEST_DIR "share/${Launcher_APP_BINARY_NAME}") set(LAUNCHER_DESKTOP_DEST_DIR "share/applications" CACHE STRING "Path to the desktop file directory") set(LAUNCHER_METAINFO_DEST_DIR "share/metainfo" CACHE STRING "Path to the metainfo directory") set(LAUNCHER_ICON_DEST_DIR "share/icons/hicolor/scalable/apps" CACHE STRING "Path to the scalable icon directory") diff --git a/launcher/Application.cpp b/launcher/Application.cpp index 6ffec1ae..babf824a 100644 --- a/launcher/Application.cpp +++ b/launcher/Application.cpp @@ -1571,7 +1571,7 @@ QString Application::getJarPath(QString jarFile) { QStringList potentialPaths = { #if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD) || defined(Q_OS_OPENBSD) - FS::PathCombine(m_rootPath, "share/jars"), + FS::PathCombine(m_rootPath, "share/" + BuildConfig.LAUNCHER_NAME), #endif FS::PathCombine(m_rootPath, "jars"), FS::PathCombine(applicationDirPath(), "jars") |