From 72014cfbec87f94cd921d72dd150635ded34b210 Mon Sep 17 00:00:00 2001 From: TheAssassin Date: Sat, 23 Feb 2019 14:00:48 +0100 Subject: [PATCH] Fix deployment of xcbglintegrations plugins The destination didn't end with a slash, so, like cp, liblinuxdeploy just created a file with that name and overwrote it with every new plugin. --- src/main.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main.cpp b/src/main.cpp index f2e3469..ebe40a4 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -70,7 +70,8 @@ bool deployPlatformPlugins(appdir::AppDir &appDir, const bf::path &qtPluginsPath // little helper called by other integration plugins bool deployIntegrationPlugins(appdir::AppDir& appDir, const bf::path& qtPluginsPath, const std::initializer_list& subDirs) { for (const bf::path& subDir : subDirs) { - auto dir = qtPluginsPath / subDir; + // make sure the path ends with a / so that liblinuxdeploy recognize the destination as a directory + auto dir = qtPluginsPath / subDir / "/"; if (!bf::is_directory(dir)) { ldLog() << "Directory" << dir << "doesn't exist, skipping deployment" << std::endl; @@ -94,7 +95,7 @@ bool deployIntegrationPlugins(appdir::AppDir& appDir, const bf::path& qtPluginsP bool deployXcbglIntegrationPlugins(appdir::AppDir& appDir, const bf::path& qtPluginsPath) { ldLog() << "Deploying xcb-gl integrations" << std::endl; - return deployIntegrationPlugins(appDir, qtPluginsPath, {"xcbglintegrations"}); + return deployIntegrationPlugins(appDir, qtPluginsPath, {"xcbglintegrations/"}); } bool deploySvgPlugins(appdir::AppDir &appDir, const bf::path &qtPluginsPath) {