From 5819f7e439c18b7533d748b019c3e54b4c244971 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Apitzsch?= Date: Fri, 22 Sep 2017 21:34:06 +0200 Subject: [PATCH] setup.py: move plugins directory to data directory --- .gitlab-ci.yml | 5 +++-- gajim/common/configpaths.py | 2 +- setup.py | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index eba492fb0..53de81757 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -29,11 +29,12 @@ run-build: - tar xzf $FN.gz - rm $FN.gz - export GF=$(find . -maxdepth 1 -type d -name 'gajim-*') - - cd $GF/gajim/plugins/ + - mkdir -p $GF/gajim/data/plugins/ + - cd $GF/gajim/data/plugins/ - curl -O https://ftp.gajim.org/plugins_1/plugin_installer.zip - unzip plugin_installer.zip - rm plugin_installer.zip - - cd ../../.. + - cd ../../../.. - tar czf ../$FN.gz gajim-* - cd .. - rm -rf tmp_add_plugins diff --git a/gajim/common/configpaths.py b/gajim/common/configpaths.py index 22eceeba5..7a8c2c780 100644 --- a/gajim/common/configpaths.py +++ b/gajim/common/configpaths.py @@ -103,7 +103,7 @@ class ConfigPaths: self.add('GUI', None, os.path.join(basedir, 'data', 'gui')) self.add('ICONS', None, os.path.join(basedir, 'data', 'icons')) self.add('HOME', None, os.path.expanduser('~')) - self.add('PLUGINS_BASE', None, os.path.join(basedir, 'plugins')) + self.add('PLUGINS_BASE', None, os.path.join(basedir, 'data', 'plugins')) def add(self, name, type_, path): self.paths[name] = (type_, path) diff --git a/setup.py b/setup.py index 220112d58..030bb77e2 100755 --- a/setup.py +++ b/setup.py @@ -219,7 +219,7 @@ package_data_moods = ['data/moods/*/*.png'] package_data_other = ['data/other/*'] package_data_sounds = ['data/sounds/*.wav'] package_data_style = ['data/style/gajim.css'] -package_plugins_data = ['plugins/*/*'] +package_plugins_data = ['data/plugins/*/*'] package_data = (package_data_activities + package_data_emoticons + package_data_gui