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

fix https://github.com/uBlockOrigin/uBlock-issues/issues/217, https://github.com/uBlockOrigin/uBlock-issues/issues/218

This commit is contained in:
Raymond Hill 2018-09-11 06:44:52 -04:00
parent 1d03134efa
commit a8c4e0214f
No known key found for this signature in database
GPG Key ID: 25E1490B761470C2
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tools/make-webext-meta.py
View File

@ -17,7 +17,7 @@ with open(os.path.join(proj_dir, 'dist', 'version')) as f:
webext_manifest = {} webext_manifest = {}
webext_manifest_file = os.path.join(build_dir, 'manifest.json') webext_manifest_file = os.path.join(build_dir, 'manifest.json')
with open(webext_manifest_file) as f2: with open(webext_manifest_file, encoding='utf-8') as f2:
webext_manifest = json.load(f2) webext_manifest = json.load(f2)
webext_manifest['version'] = version webext_manifest['version'] = version
@ -28,6 +28,6 @@ if match:
webext_manifest['short_name'] += ' dev build' webext_manifest['short_name'] += ' dev build'
webext_manifest['browser_action']['default_title'] += ' dev build' webext_manifest['browser_action']['default_title'] += ' dev build'
with open(webext_manifest_file, 'w') as f2: with open(webext_manifest_file, mode='w', encoding='utf-8') as f2:
json.dump(webext_manifest, f2, indent=2, separators=(',', ': '), sort_keys=True) json.dump(webext_manifest, f2, indent=2, separators=(',', ': '), sort_keys=True)
f2.write('\n') f2.write('\n')

5
tools/make-webext.sh
View File

@ -2,6 +2,9 @@
# #
# This script assumes a linux environment # This script assumes a linux environment
# https://github.com/uBlockOrigin/uBlock-issues/issues/217
set -e
echo "*** uBlock0.webext: Creating web store package" echo "*** uBlock0.webext: Creating web store package"
echo "*** uBlock0.webext: Copying files" echo "*** uBlock0.webext: Copying files"
@ -45,7 +48,7 @@ cp -R src/web_accessible_resources $DES/
python3 tools/import-war.py $DES/ python3 tools/import-war.py $DES/
echo "*** uBlock0.webext: Generating meta..." echo "*** uBlock0.webext: Generating meta..."
python tools/make-webext-meta.py $DES/ python3 tools/make-webext-meta.py $DES/
if [ "$1" = all ]; then if [ "$1" = all ]; then
echo "*** uBlock0.webext: Creating package..." echo "*** uBlock0.webext: Creating package..."