Use unzip from setuphelpers instead of 7z.exe

master
Daniel Berteaud 6 years ago
parent 172a54a517
commit e90d36a0bf
  1. 4
      WAPT/control
  2. 4
      setup.py

@ -1,11 +1,11 @@
package : fws-thunderbird-sogo-addons package : fws-thunderbird-sogo-addons
version : 60.0.0-1 version : 60.0.0-2
architecture : all architecture : all
section : base section : base
priority : optional priority : optional
maintainer : Daniel Berteaud <daniel@firewall-services.com> maintainer : Daniel Berteaud <daniel@firewall-services.com>
description : SOGo addons for Thunderbird description : SOGo addons for Thunderbird
depends : fws-thunderbird-config,fws-7zip depends : fws-thunderbird-config
conflicts : conflicts :
maturity : DEV maturity : DEV
locale : locale :

@ -26,10 +26,10 @@ def install():
mkdirs(makepath(programfiles,'Mozilla Thunderbird','distribution','extensions','sogo-%s@inverse.ca' % extension)) mkdirs(makepath(programfiles,'Mozilla Thunderbird','distribution','extensions','sogo-%s@inverse.ca' % extension))
# connector can be extracted as is # connector can be extracted as is
run('"%s" x -y -o"%s" sogo-connector-%s.xpi' % (makepath(programfiles,'7-Zip','7z.exe'), makepath(programfiles,'Mozilla Thunderbird','distribution','extensions','sogo-connector@inverse.ca'), connector_version)) unzip('sogo-connector-%s.xpi' % connector_version, makepath(programfiles,'Mozilla Thunderbird','distribution','extensions','sogo-connector@inverse.ca'))
# Integrator must be customized, so first extract it # Integrator must be customized, so first extract it
run('"%s" x -y -o"%s" sogo-integrator-%s-sogo-demo.xpi' % (makepath(programfiles,'7-Zip','7z.exe'), makepath(programfiles,'Mozilla Thunderbird','distribution','extensions','sogo-integrator@inverse.ca'), integrator_version)) unzip('sogo-integrator-%s-sogo-demo.xpi' % integrator_version, makepath(programfiles,'Mozilla Thunderbird','distribution','extensions','sogo-integrator@inverse.ca'))
# And replace the extensions.rdf content # And replace the extensions.rdf content
jinja2 = Environment( jinja2 = Environment(
loader=FileSystemLoader(os.path.dirname(os.path.abspath(__file__))), loader=FileSystemLoader(os.path.dirname(os.path.abspath(__file__))),

Loading…
Cancel
Save