From 6ec45c1bb40deb7490ad04921014d53ceca1d551 Mon Sep 17 00:00:00 2001 From: "Barry-Thomas-Paul: Moss" Date: Thu, 19 Oct 2023 19:06:50 -0400 Subject: [PATCH] Update to work with AppImage Linxu ppImage Works with this minor fix. Linux FlatPak still not working yet. --- easymacro.py | 6 +----- extension/ZAZPip_v0.10.2.oxt | Bin 77000 -> 80787 bytes source/pythonpath/easymacro.py | 6 +++++- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/easymacro.py b/easymacro.py index 2249133..cbb26a0 100644 --- a/easymacro.py +++ b/easymacro.py @@ -6184,11 +6184,7 @@ class Paths(object): elif IS_MAC: path = self.join(self.config('Module'), '..', 'Resources', PYTHON) else: - is_app_image = bool(os.getenv("APPIMAGE", "")) - if is_app_image: - path = self.join(self.config("Module"), "python") - else: - path = sys.executable + path = sys.executable return path @classmethod diff --git a/extension/ZAZPip_v0.10.2.oxt b/extension/ZAZPip_v0.10.2.oxt index 8741d0be1b8f7b0e83bf3b2564d0dafeb098bf87..897da46d51978d562540770e24e8b51ef57334d9 100644 GIT binary patch delta 5638 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 diff --git a/source/pythonpath/easymacro.py b/source/pythonpath/easymacro.py index cbb26a0..4ab44ce 100644 --- a/source/pythonpath/easymacro.py +++ b/source/pythonpath/easymacro.py @@ -6184,7 +6184,11 @@ class Paths(object): elif IS_MAC: path = self.join(self.config('Module'), '..', 'Resources', PYTHON) else: - path = sys.executable + is_app_image = bool(os.getenv("APPIMAGE", "")) + if is_app_image: + path = self.join(self.config("Module"), PYTHON) + else: + path = sys.executable return path @classmethod