From 40862880443829cb2e5b0d804d554de688b4826e Mon Sep 17 00:00:00 2001 From: Mario Voigt Date: Thu, 29 Apr 2021 14:51:31 +0200 Subject: [PATCH] fixed boxes.py to work on both linux and windows --- extensions/fablabchemnitz/boxes.py/boxes | 4 ---- extensions/fablabchemnitz/boxes.py/boxes.exe | Bin extensions/fablabchemnitz/boxes.py/boxes_proxy.py | 5 +---- 3 files changed, 1 insertion(+), 8 deletions(-) delete mode 100644 extensions/fablabchemnitz/boxes.py/boxes mode change 100644 => 100755 extensions/fablabchemnitz/boxes.py/boxes.exe diff --git a/extensions/fablabchemnitz/boxes.py/boxes b/extensions/fablabchemnitz/boxes.py/boxes deleted file mode 100644 index 7ad985c6..00000000 --- a/extensions/fablabchemnitz/boxes.py/boxes +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/python3 -# EASY-INSTALL-SCRIPT: 'boxes==0.9','boxes' -__requires__ = 'boxes==0.9' -__import__('pkg_resources').run_script('boxes==0.9', 'boxes') diff --git a/extensions/fablabchemnitz/boxes.py/boxes.exe b/extensions/fablabchemnitz/boxes.py/boxes.exe old mode 100644 new mode 100755 diff --git a/extensions/fablabchemnitz/boxes.py/boxes_proxy.py b/extensions/fablabchemnitz/boxes.py/boxes_proxy.py index 70ef0e20..bed58d35 100644 --- a/extensions/fablabchemnitz/boxes.py/boxes_proxy.py +++ b/extensions/fablabchemnitz/boxes.py/boxes_proxy.py @@ -35,10 +35,7 @@ class boxesPyWrapper(inkex.GenerateExtension): if os.path.exists(box_file): os.remove(box_file) #remove previously generated box file at the beginning - if os.name == "nt": - cmd = "boxes.exe" - else: - cmd = "./boxes" + cmd = "boxes" #boxes.exe in this local dir (or if present in %PATH%), or boxes from $PATH in linux for arg in vars(self.options): if arg != "output" and arg != "ids" and arg != "selected_nodes": #inkex.utils.debug(str(arg) + " = " + str(getattr(self.options, arg)))