From a19efa4ebeb7a5211ac5e573f17bfdaa16858f0a Mon Sep 17 00:00:00 2001
From: gorhill <rhill@raymondhill.net>
Date: Sun, 1 Oct 2017 10:28:33 -0400
Subject: [PATCH] fix #3082 (use "dev build" in extension name)

---
 platform/chromium/vapi-background.js |  2 +-
 tools/make-chromium-meta.py          | 32 ++++++++++++++++++++++++++++
 tools/make-chromium.sh               |  9 ++++----
 3 files changed, 37 insertions(+), 6 deletions(-)
 create mode 100644 tools/make-chromium-meta.py

diff --git a/platform/chromium/vapi-background.js b/platform/chromium/vapi-background.js
index 46a3870ac..a3fdc6815 100644
--- a/platform/chromium/vapi-background.js
+++ b/platform/chromium/vapi-background.js
@@ -59,7 +59,7 @@ var noopFunc = function(){};
 /******************************************************************************/
 
 vAPI.app = {
-    name: manifest.name,
+    name: manifest.name.replace(' dev build', ''),
     version: manifest.version
 };
 
diff --git a/tools/make-chromium-meta.py b/tools/make-chromium-meta.py
new file mode 100644
index 000000000..04990bfa7
--- /dev/null
+++ b/tools/make-chromium-meta.py
@@ -0,0 +1,32 @@
+#!/usr/bin/env python3
+
+import os
+import json
+import re
+import sys
+
+if len(sys.argv) == 1 or not sys.argv[1]:
+    raise SystemExit('Build dir missing.')
+
+proj_dir = os.path.join(os.path.split(os.path.abspath(__file__))[0], '..')
+
+manifest_in = {}
+manifest_in_file = os.path.join(proj_dir, 'platform', 'chromium', 'manifest.json')
+with open(manifest_in_file) as f1:
+    manifest_in = json.load(f1)
+
+# Development build? If so, modify name accordingly.
+match = re.search('^\d+\.\d+\.\d+\.\d+$', manifest_in['version'])
+if match:
+    build_dir = os.path.abspath(sys.argv[1])
+    dev_build = ' dev build'
+    manifest_out = {}
+    manifest_out_file = os.path.join(build_dir, 'manifest.json')
+    with open(manifest_out_file) as f2:
+        manifest_out = json.load(f2)
+    manifest_out['name'] += dev_build
+    manifest_out['short_name'] += dev_build
+    manifest_out['browser_action']['default_title'] += dev_build
+    with open(manifest_out_file, 'w') as f2:
+        json.dump(manifest_out, f2, indent=2, separators=(',', ': '), sort_keys=True)
+        f2.write('\n')
diff --git a/tools/make-chromium.sh b/tools/make-chromium.sh
index eda30f299..bf019146f 100755
--- a/tools/make-chromium.sh
+++ b/tools/make-chromium.sh
@@ -5,11 +5,7 @@
 echo "*** uBlock0.chromium: Creating web store package"
 echo "*** uBlock0.chromium: Copying files"
 
-if [ "$1" = experimental ]; then
-    DES=dist/build/experimental/uBlock0.chromium
-else
-    DES=dist/build/uBlock0.chromium
-fi
+DES=dist/build/uBlock0.chromium
 rm -rf $DES
 mkdir -p $DES
 
@@ -28,6 +24,9 @@ cp platform/chromium/*.html $DES/
 cp platform/chromium/*.json $DES/
 cp LICENSE.txt              $DES/
 
+echo "*** uBlock0.chromium: Generating meta..."
+python tools/make-chromium-meta.py $DES/
+
 if [ "$1" = all ]; then
     echo "*** uBlock0.chromium: Creating package..."
     pushd $(dirname $DES/) > /dev/null