From 10972a55df025421a92501e3a58a78022d147be0 Mon Sep 17 00:00:00 2001 From: gorhill Date: Fri, 11 Aug 2017 00:11:14 -0400 Subject: [PATCH] fix https://github.com/gorhill/uBlock/issues/2855 --- platform/chromium/manifest.json | 2 +- tools/make-webext-meta.py | 12 +++++++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/platform/chromium/manifest.json b/platform/chromium/manifest.json index 0326446..b039cf0 100644 --- a/platform/chromium/manifest.json +++ b/platform/chromium/manifest.json @@ -2,7 +2,7 @@ "manifest_version": 2, "name": "uMatrix", "short_name": "uMatrix", - "version": "1.0.1.4", + "version": "1.0.1.5", "description": "__MSG_extShortDesc__", "icons": { "16": "img/icon_16.png", diff --git a/tools/make-webext-meta.py b/tools/make-webext-meta.py index 5f0b8cb..f0c8ff2 100755 --- a/tools/make-webext-meta.py +++ b/tools/make-webext-meta.py @@ -2,6 +2,7 @@ import os import json +import re import sys if len(sys.argv) == 1 or not sys.argv[1]: @@ -23,7 +24,16 @@ webext_manifest_file = os.path.join(build_dir, 'manifest.json') with open(webext_manifest_file) as f2: webext_manifest = json.load(f2) -webext_manifest['version'] = chromium_manifest['version'] +match = re.search('^(\d+\.\d+\.\d+)(\.\d+)$', chromium_manifest['version']) +if match: + buildtype = int(match.group(2)[1:]) + if buildtype < 100: + builttype = 'b' + str(buildtype) + else: + builttype = 'rc' + str(buildtype - 100) + webext_manifest['version'] = match.group(1) + builttype +else: + webext_manifest['version'] = chromium_manifest['version'] with open(webext_manifest_file, 'w') as f2: json.dump(webext_manifest, f2, indent=2, separators=(',', ': '), sort_keys=True)