From d1589f254c8993c733877a4c54a19a7aa719377f Mon Sep 17 00:00:00 2001 From: Daniel Berteaud Date: Mon, 7 Jan 2019 19:04:18 +0100 Subject: [PATCH] Update to 60.4.0 --- WAPT/control | 4 ++-- setup.py | 31 ++++++++++++++++--------------- win32/Thunderbird Setup 60.3.2.exe | 3 --- win32/Thunderbird Setup 60.4.0.exe | 3 +++ win64/Thunderbird Setup 60.3.2.exe | 3 --- win64/Thunderbird Setup 60.4.0.exe | 3 +++ win64/win32/Thunderbird Setup 60.3.2.exe | 3 --- 7 files changed, 24 insertions(+), 26 deletions(-) delete mode 100644 win32/Thunderbird Setup 60.3.2.exe create mode 100644 win32/Thunderbird Setup 60.4.0.exe delete mode 100644 win64/Thunderbird Setup 60.3.2.exe create mode 100644 win64/Thunderbird Setup 60.4.0.exe delete mode 100644 win64/win32/Thunderbird Setup 60.3.2.exe diff --git a/WAPT/control b/WAPT/control index 5763967..d008cdd 100644 --- a/WAPT/control +++ b/WAPT/control @@ -1,5 +1,5 @@ package : fws-thunderbird -version : 60.3.2-3 +version : 60.4.0-7 architecture : all section : base priority : optional @@ -7,7 +7,7 @@ maintainer : Daniel Berteaud description : Mozilla Thunderbird email client depends : conflicts : -maturity : PROD +maturity : PREPROD locale : fr target_os : windows min_os_version : 6.1 diff --git a/setup.py b/setup.py index 91b5338..1542c5d 100644 --- a/setup.py +++ b/setup.py @@ -72,25 +72,26 @@ def update_package(): filename = '' url = requests.head('https://download.mozilla.org/?product=thunderbird-latest').headers['Location'] - filename = urlparse.unquote(url.rsplit('/',1)[1]) - version = re.findall(r'Thunderbird Setup (.*)\.exe',filename)[0] + exe = urlparse.unquote(url.rsplit('/',1)[1]) + version = re.findall(r'Thunderbird Setup (.*)\.exe',exe)[0] control = PackageEntry().load_control_from_wapt ('.') + for arch in ['32','64']: + filename = makepath('win%s' % arch, exe) + url = 'https://download-installer.cdn.mozilla.net/pub/thunderbird/releases/%s/win%s/fr/Thunderbird%sSetup%s%s.exe' % (version,arch,'%20','%20',version) + if not isfile(filename): + print('Downloading %s from %s'%(filename,url)) + wget(url,filename) + + # removes old exe + if isfile(filename): + exes = glob.glob(r'win%s\Thunderbird*.exe' % arch) + for fn in exes: + if fn != filename: + remove_file(fn) + if Version(version) > Version(control['version'].split('-',1)[0]): print('Updating package to %s' % version) - for arch in ['32','64']: - filename = makepath('win%s' % arch, filename) - url = 'https://download-installer.cdn.mozilla.net/pub/thunderbird/releases/%s/win%s/fr/Thunderbird%sSetup%s%s.exe' % (version,arch,'%20','%20',version) - if not isfile(filename): - print('Downloading %s from %s'%(filename,url)) - wget(url,filename) - - # removes old exe - if isfile(filename): - exes = glob.glob(r'x%s\Thunderbird*.exe' % arch) - for fn in exes: - if fn != filename: - remove_file(fn) # updates control version from filename, increment package version. control.version = '%s-%s'%(re.findall(r'Thunderbird Setup (.*)\.exe',filename)[0],int(control.version.split('-',1)[1])+1) diff --git a/win32/Thunderbird Setup 60.3.2.exe b/win32/Thunderbird Setup 60.3.2.exe deleted file mode 100644 index 81a9f7a..0000000 --- a/win32/Thunderbird Setup 60.3.2.exe +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3b792a7127d710a38ce3acb49d5b9c507bf0f969cb56be5ffa3f3407b00b98ce -size 32087816 diff --git a/win32/Thunderbird Setup 60.4.0.exe b/win32/Thunderbird Setup 60.4.0.exe new file mode 100644 index 0000000..9e74091 --- /dev/null +++ b/win32/Thunderbird Setup 60.4.0.exe @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f19c73f183b2fa98d6c6ac79480b6d18dbbef48b2d5788d53cf19eab3c45541b +size 32106376 diff --git a/win64/Thunderbird Setup 60.3.2.exe b/win64/Thunderbird Setup 60.3.2.exe deleted file mode 100644 index 9798d22..0000000 --- a/win64/Thunderbird Setup 60.3.2.exe +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:07fb668c306d33ae6d23aa671012056ed7ea05c425bdcf3ef23c931d1718a2bb -size 35803680 diff --git a/win64/Thunderbird Setup 60.4.0.exe b/win64/Thunderbird Setup 60.4.0.exe new file mode 100644 index 0000000..a0284d8 --- /dev/null +++ b/win64/Thunderbird Setup 60.4.0.exe @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fc81b51ee070bbad7cf05400da0f8160b8be6e0d45c3ac56b29bbe9182c8a04a +size 35831688 diff --git a/win64/win32/Thunderbird Setup 60.3.2.exe b/win64/win32/Thunderbird Setup 60.3.2.exe deleted file mode 100644 index 9798d22..0000000 --- a/win64/win32/Thunderbird Setup 60.3.2.exe +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:07fb668c306d33ae6d23aa671012056ed7ea05c425bdcf3ef23c931d1718a2bb -size 35803680