diff --git a/platform/chromium/manifest.json b/platform/chromium/manifest.json index 47ed59354..f73403ac9 100644 --- a/platform/chromium/manifest.json +++ b/platform/chromium/manifest.json @@ -2,7 +2,7 @@ "manifest_version": 2, "name": "uBlock Origin", - "version": "1.8.1", + "version": "1.8.1.1", "default_locale": "en", "description": "__MSG_extShortDesc__", diff --git a/platform/opera/manifest.json b/platform/opera/manifest.json index 7129f7c7d..89ed96035 100644 --- a/platform/opera/manifest.json +++ b/platform/opera/manifest.json @@ -2,7 +2,7 @@ "manifest_version": 2, "name": "uBlock Origin", - "version": "1.8.1", + "version": "1.8.1.1", "default_locale": "en", "description": "__MSG_extShortDesc__", diff --git a/tools/make-firefox-meta.py b/tools/make-firefox-meta.py index 974e67394..75e3c97b3 100644 --- a/tools/make-firefox-meta.py +++ b/tools/make-firefox-meta.py @@ -2,6 +2,7 @@ import os import json +import re import sys from io import open from shutil import rmtree @@ -75,8 +76,10 @@ with open(chromium_manifest, encoding='utf-8') as m: # https://developer.mozilla.org/en-US/Add-ons/AMO/Policy/Maintenance#How_do_I_submit_a_Beta_add-on.3F # "To create a beta channel [...] '(a|alpha|b|beta|pre|rc)\d*$' " -if sys.argv[2]: - manifest['version'] += sys.argv[2] + +match = re.search('^(\d+\.\d+\.\d+)(\.\d+)$', manifest['version']) +if match: + manifest['version'] = match.group(1) + 'b' + match.group(2)[1:] manifest['homepage'] = 'https://github.com/gorhill/uBlock' manifest['description'] = descriptions['en'] diff --git a/tools/make-firefox.sh b/tools/make-firefox.sh index fa43e3f1e..7d4c3c5ed 100755 --- a/tools/make-firefox.sh +++ b/tools/make-firefox.sh @@ -32,7 +32,7 @@ cp platform/firefox/*.xul $DES/ cp LICENSE.txt $DES/ echo "*** uBlock0.firefox: Generating meta..." -python tools/make-firefox-meta.py $DES/ "$2" +python tools/make-firefox-meta.py $DES/ if [ "$1" = all ]; then set +v