GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-18 11:25:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

Specify the plugin directory as being an AppImage module directory

Browse Source 
CURA-12091
This commit is contained in:
Erwan MATHIEU 2024-08-30 12:20:00 +02:00
parent 79ad3e70ee
commit 34dcd3801d
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
cura/BackendPlugin.py
View File

@ -3,6 +3,7 @@
import socket
import os
import subprocess
import pathlib
from typing import Optional, List
from UM.Logger import Logger
@ -74,7 +75,8 @@ class BackendPlugin(AdditionalSettingDefinitionsAppender, PluginObject):
"""
if not self.usePlugin():
return False
Logger.info(f"Starting backend_plugin [{self._plugin_id}] with command: {self._validatePluginCommand()}")
validated_plugin_command = self._validatePluginCommand()
Logger.info(f"Starting backend_plugin [{self._plugin_id}] with command: {validated_plugin_command}")
plugin_log_path = os.path.join(Resources.getDataStoragePath(), f"{self.getPluginId()}.log")
if os.path.exists(plugin_log_path):
try:
@ -95,12 +97,14 @@ class BackendPlugin(AdditionalSettingDefinitionsAppender, PluginObject):
popen_kwargs["creationflags"] = subprocess.CREATE_NO_WINDOW
plugin_env = os.environ
if "LD_PRELOAD" in plugin_env and "APPRUN_ORIGINAL_LD_PRELOAD" in plugin_env:
plugin_env["LD_PRELOAD"] = plugin_env["APPRUN_ORIGINAL_LD_PRELOAD"]
if Platform.isLinux() and len(validated_plugin_command) > 0:
# Add plugin directory to AppImage "modules" directory so that it is started as if it was
# part of the AppImage and uses the sames libraries
plugin_env["APPDIR_MODULE_DIR"] = str(pathlib.Path(validated_plugin_command[0]).parent.absolute())
Logger.info(plugin_env)
self._process = subprocess.Popen(self._validatePluginCommand(), env=plugin_env, **popen_kwargs)
self._process = subprocess.Popen(validated_plugin_command, env=plugin_env, **popen_kwargs)
self._is_running = True
return True
except PermissionError: