From fa7b0777f30bf7ee5be45adea338bb817fe92fb0 Mon Sep 17 00:00:00 2001
From: gorhill <rhill@raymondhill.net>
Date: Tue, 8 Aug 2017 16:32:44 -0400
Subject: [PATCH] rename more accurately webext version to webext-hybrid

---
 .travis.yml                      |  2 +-
 tools/make-webext-hybrid-meta.py |  2 +-
 tools/make-webext-hybrid.sh      | 14 +++++++-------
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index d753255..fab8777 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,7 +3,7 @@ env:
   matrix:
   - BROWSER=chromium EXT=zip
   - BROWSER=firefox EXT=xpi
-  - BROWSER=webext EXT=xpi
+  - BROWSER=webext-hybrid EXT=xpi
 script: ./tools/make-${BROWSER}.sh all
 deploy:
   provider: releases
diff --git a/tools/make-webext-hybrid-meta.py b/tools/make-webext-hybrid-meta.py
index 41c8a85..469c893 100755
--- a/tools/make-webext-hybrid-meta.py
+++ b/tools/make-webext-hybrid-meta.py
@@ -44,7 +44,7 @@ for alpha2 in sorted(os.listdir(source_locale_dir)):
     descriptions[alpha2] = strings['extShortDesc']['message']
 
 webext_manifest['author'] = chromium_manifest['author'];
-webext_manifest['name'] = chromium_manifest['name'] + '/webext';
+webext_manifest['name'] = chromium_manifest['name'] + '/webext-hybrid';
 webext_manifest['homepage'] = 'https://github.com/gorhill/uMatrix'
 webext_manifest['description'] = escape(descriptions['en'])
 del descriptions['en']
diff --git a/tools/make-webext-hybrid.sh b/tools/make-webext-hybrid.sh
index 2c67d70..a66af17 100755
--- a/tools/make-webext-hybrid.sh
+++ b/tools/make-webext-hybrid.sh
@@ -2,10 +2,10 @@
 #
 # This script assumes a linux environment
 
-echo "*** uMatrix.webext: Creating web store package"
-echo "*** uMatrix.webext: Copying files"
+echo "*** uMatrix.webext-hybrid: Creating web store package"
+echo "*** uMatrix.webext-hybrid: Copying files"
 
-DES=dist/build/uMatrix.webext
+DES=dist/build/uMatrix.webext-hybrid
 rm -rf $DES
 mkdir -p $DES/webextension
 
@@ -25,14 +25,14 @@ cp    platform/webext/chrome.manifest    $DES/
 cp    platform/webext/install.rdf        $DES/
 mv    $DES/webextension/img/icon_128.png $DES/icon.png
 
-echo "*** uMatrix.webext: Generating meta..."
-python tools/make-webext-meta.py $DES/
+echo "*** uMatrix.webext-hybrid: Generating meta..."
+python tools/make-webext-hybrid-meta.py $DES/
 
 if [ "$1" = all ]; then
-    echo "*** uMatrix.webext: Creating package..."
+    echo "*** uMatrix.webext-hybrid: Creating package..."
     pushd $DES > /dev/null
     zip ../$(basename $DES).xpi -qr *
     popd > /dev/null
 fi
 
-echo "*** uMatrix.webext: Package done."
+echo "*** uMatrix.webext-hybrid: Package done."