summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorgorhill <rhill@raymondhill.net>2016-08-04 08:24:11 -0400
committergorhill <rhill@raymondhill.net>2016-08-04 08:24:11 -0400
commitc274195b69dfb203af07edb04457d27cfb279a81 (patch)
treec7eb40319d9dc492f3649377b375b4b0711b62bd /tools
parenta5a9e0ce7c60b14eb49c6fa86ff4dac1255eb035 (diff)
bring support for dev build in Chrome store
Diffstat (limited to 'tools')
-rw-r--r--tools/make-firefox-meta.py7
-rwxr-xr-xtools/make-firefox.sh2
2 files changed, 6 insertions, 3 deletions
diff --git a/tools/make-firefox-meta.py b/tools/make-firefox-meta.py
index 974e6739..75e3c97b 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 fa43e3f1..7d4c3c5e 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