copyleftie
/
gajim-plural
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

setup.py: move plugins directory to data directory

This commit is contained in:
André Apitzsch 2017-09-22 21:34:06 +02:00
parent af89d7cfa6
commit 5819f7e439
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.gitlab-ci.yml
View File

@ -29,11 +29,12 @@ run-build:
- tar xzf $FN.gz - tar xzf $FN.gz
- rm $FN.gz - rm $FN.gz
- export GF=$(find . -maxdepth 1 -type d -name 'gajim-*') - 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 - curl -O https://ftp.gajim.org/plugins_1/plugin_installer.zip
- unzip plugin_installer.zip - unzip plugin_installer.zip
- rm plugin_installer.zip - rm plugin_installer.zip
- cd ../../.. - cd ../../../..
- tar czf ../$FN.gz gajim-* - tar czf ../$FN.gz gajim-*
- cd .. - cd ..
- rm -rf tmp_add_plugins - rm -rf tmp_add_plugins

2
gajim/common/configpaths.py
View File

@ -103,7 +103,7 @@ class ConfigPaths:
self.add('GUI', None, os.path.join(basedir, 'data', 'gui')) self.add('GUI', None, os.path.join(basedir, 'data', 'gui'))
self.add('ICONS', None, os.path.join(basedir, 'data', 'icons')) self.add('ICONS', None, os.path.join(basedir, 'data', 'icons'))
self.add('HOME', None, os.path.expanduser('~')) 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): def add(self, name, type_, path):
self.paths[name] = (type_, path) self.paths[name] = (type_, path)

2
setup.py
View File

@ -219,7 +219,7 @@ package_data_moods = ['data/moods/*/*.png']
package_data_other = ['data/other/*'] package_data_other = ['data/other/*']
package_data_sounds = ['data/sounds/*.wav'] package_data_sounds = ['data/sounds/*.wav']
package_data_style = ['data/style/gajim.css'] package_data_style = ['data/style/gajim.css']
package_plugins_data = ['plugins/*/*'] package_plugins_data = ['data/plugins/*/*']
package_data = (package_data_activities package_data = (package_data_activities
+ package_data_emoticons + package_data_emoticons
+ package_data_gui + package_data_gui