From be3f2d160ebbef1b6c3b463c6d45eb6d4d7be065 Mon Sep 17 00:00:00 2001 From: Yann Leboulanger Date: Wed, 7 Mar 2018 13:47:06 +0100 Subject: [PATCH] [Thilo Molitor] Ability to separate plugins dir when using -s option. --- plugin_installer/manifest.ini | 2 +- plugin_installer/plugin_installer.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/plugin_installer/manifest.ini b/plugin_installer/manifest.ini index ea86533..21bfc67 100644 --- a/plugin_installer/manifest.ini +++ b/plugin_installer/manifest.ini @@ -1,7 +1,7 @@ [info] name: Plugin Installer short_name: plugin_installer -version: 0.20.0 +version: 0.20.1 description: Install and upgrade plugins from ftp authors: Denis Fomin Yann Leboulanger diff --git a/plugin_installer/plugin_installer.py b/plugin_installer/plugin_installer.py index 2cfda1d..8748d87 100644 --- a/plugin_installer/plugin_installer.py +++ b/plugin_installer/plugin_installer.py @@ -528,7 +528,7 @@ class DownloadAsync(threading.Thread): local_dir = os.path.join(user_dir, remote_dir) if not os.path.isdir(local_dir): os.mkdir(local_dir) - local_dir = os.path.split(user_dir)[0] + local_dir = os.path.dirname(local_dir) # downloading zip file try: @@ -538,7 +538,7 @@ class DownloadAsync(threading.Thread): log.exception("Error downloading plugin %s" % filename) continue with ZipFile(buf) as zip_file: - zip_file.extractall(os.path.join(local_dir, 'plugins')) + zip_file.extractall(local_dir) GLib.idle_add(self.plugin.on_plugin_downloaded, self.remote_dirs)