diff options
| author | Lex Neva <lexelby@users.noreply.github.com> | 2018-07-13 19:51:25 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-13 19:51:25 -0400 |
| commit | c6ebfea5425229f19e12d40391ff1d6253ea4c55 (patch) | |
| tree | 58a53c0730c516b9ce53ec873fd23e9463cb631f /lib/extensions/install.py | |
| parent | 67342608b0d059bc3ec79001e62d0bc0cdb251d4 (diff) | |
| parent | 6caba7b839e9f4e90ab9f3ff1110c8759e30337d (diff) | |
Merge pull request #224 from inkstitch/lexelby-trim-stop-commands
trim and stop commands
Diffstat (limited to 'lib/extensions/install.py')
| -rw-r--r-- | lib/extensions/install.py | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/lib/extensions/install.py b/lib/extensions/install.py index d55b96d0..42a92113 100644 --- a/lib/extensions/install.py +++ b/lib/extensions/install.py @@ -13,7 +13,7 @@ import logging import wx import inkex -from ..utils import guess_inkscape_config_path +from ..utils import guess_inkscape_config_path, get_bundled_dir class InstallerFrame(wx.Frame): @@ -78,15 +78,9 @@ class InstallerFrame(wx.Frame): def install_addons(self, type): path = os.path.join(self.path, type) - src_dir = self.get_bundled_dir(type) + src_dir = get_bundled_dir(type) self.copy_files(glob(os.path.join(src_dir, "*")), path) - def get_bundled_dir(self, name): - if getattr(sys, 'frozen', None) is not None: - return realpath(os.path.join(sys._MEIPASS, '..', name)) - else: - return realpath(os.path.join(dirname(realpath(__file__)), '..', '..', name)) - if (sys.platform == "win32"): # If we try to just use shutil.copy it says the operation requires elevation. def copy_files(self, files, dest): |
