Mirrors
/
uBlock
mirror of https://github.com/gorhill/uBlock.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix code patching updates.json

This commit is contained in:
Raymond Hill 2018-02-26 15:32:29 -05:00
parent 943553bf2b
commit 94ebeea314
No known key found for this signature in database
GPG Key ID: 25E1490B761470C2
2 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
dist/firefox/publish-signed-beta.py vendored
View File

@ -14,6 +14,7 @@ import time
import zipfile import zipfile
from distutils.version import StrictVersion from distutils.version import StrictVersion
from string import Template
# - Download target (raw) uBlock0.webext.xpi from GitHub # - Download target (raw) uBlock0.webext.xpi from GitHub
# - This is referred to as "raw" package # - This is referred to as "raw" package
@ -239,21 +240,15 @@ updates_json_filepath = os.path.join(projdir, 'dist', 'firefox', 'updates.json')
with open(updates_json_filepath) as f: with open(updates_json_filepath) as f:
updates_json = json.load(f) updates_json = json.load(f)
f.close() f.close()
update_entry = updates_json['addons'][extension_id]['updates'][0] previous_version = updates_json['addons'][extension_id]['updates'][0]['version']
previous_version = update_entry['version']
if StrictVersion(version) > StrictVersion(previous_version): if StrictVersion(version) > StrictVersion(previous_version):
with open(os.path.join(projdir, 'platform', 'webext', 'updates.template.json')) as f: with open(os.path.join(projdir, 'platform', 'webext', 'updates.template.json')) as f:
template_json = json.load(f) template_json = Template(f.read())
f.close() f.close()
update_entry = updates_json['addons'][extension_id]['updates'][0] updates_json = template_json.substitute(version=version)
update_entry['version'] = version
update_entry['update_info_url'] = update_entry['update_info_url'].format(version=version)
update_entry['update_link'] = update_entry['update_link'].format(version=version)
with open(updates_json_filepath, 'w') as f: with open(updates_json_filepath, 'w') as f:
json.dump(template_json, f, indent=1, separators=(',', ': ')) f.write(updates_json)
f.write('\n')
f.close() f.close()
subprocess.run('git status')
# TODO: automatically git add/commit? # TODO: automatically git add/commit?
print('All done.') print('All done.')

6
platform/webext/updates.template.json
View File

@ -3,10 +3,10 @@
"uBlock0@raymondhill.net": { "uBlock0@raymondhill.net": {
"updates": [ "updates": [
{ {
"version": "{version}", "version": "$version",
"applications": { "gecko": { "strict_min_version": "52" } }, "applications": { "gecko": { "strict_min_version": "52" } },
"update_info_url": "https://github.com/gorhill/uBlock/releases/tag/{version}", "update_info_url": "https://github.com/gorhill/uBlock/releases/tag/$version",
"update_link": "https://github.com/gorhill/uBlock/releases/download/{version}/uBlock0.webext.signed.xpi" "update_link": "https://github.com/gorhill/uBlock/releases/download/$version/uBlock0.webext.signed.xpi"
} }
] ]
} }