From ef1aab52299ba5767fb482a66f1c340351f9eecc Mon Sep 17 00:00:00 2001
From: Florian Dold <florian@dold.me>
Date: Wed, 7 Sep 2022 15:55:54 +0200
Subject: common manifest, bump version

---
 .../taler-wallet-webextension/manifest-common.json     | 18 ++++++++++++++++++
 packages/taler-wallet-webextension/manifest-v2.json    | 18 +-----------------
 packages/taler-wallet-webextension/manifest-v3.json    |  5 -----
 packages/taler-wallet-webextension/pack.sh             |  8 +++-----
 4 files changed, 22 insertions(+), 27 deletions(-)
 create mode 100644 packages/taler-wallet-webextension/manifest-common.json

diff --git a/packages/taler-wallet-webextension/manifest-common.json b/packages/taler-wallet-webextension/manifest-common.json
new file mode 100644
index 000000000..c2c1f2438
--- /dev/null
+++ b/packages/taler-wallet-webextension/manifest-common.json
@@ -0,0 +1,18 @@
+{
+  "name": "GNU Taler Wallet (git)",
+  "description": "Privacy preserving and transparent payments",
+  "author": "GNU Taler Developers",
+  "version": "0.9.0.18",
+  "version_name": "0.9.0-dev.18",
+  "icons": {
+    "16": "static/img/taler-logo-16.png",
+    "19": "static/img/taler-logo-19.png",
+    "32": "static/img/taler-logo-32.png",
+    "38": "static/img/taler-logo-38.png",
+    "48": "static/img/taler-logo-48.png",
+    "64": "static/img/taler-logo-64.png",
+    "128": "static/img/taler-logo-128.png",
+    "256": "static/img/taler-logo-256.png",
+    "512": "static/img/taler-logo-512.png"
+  }
+}
diff --git a/packages/taler-wallet-webextension/manifest-v2.json b/packages/taler-wallet-webextension/manifest-v2.json
index 365ec14fe..e2dd67623 100644
--- a/packages/taler-wallet-webextension/manifest-v2.json
+++ b/packages/taler-wallet-webextension/manifest-v2.json
@@ -1,10 +1,5 @@
 {
   "manifest_version": 2,
-  "name": "GNU Taler Wallet (git)",
-  "description": "Privacy preserving and transparent payments",
-  "author": "GNU Taler Developers",
-  "version": "0.9.0.17",
-  "version_name": "0.9.0-dev.17",
   "minimum_chrome_version": "51",
   "minimum_opera_version": "36",
   "browser_specific_settings": {
@@ -13,17 +8,6 @@
       "strict_min_version": "57.0"
     }
   },
-  "icons": {
-    "16": "static/img/taler-logo-16.png",
-    "19": "static/img/taler-logo-19.png",
-    "32": "static/img/taler-logo-32.png",
-    "38": "static/img/taler-logo-38.png",
-    "48": "static/img/taler-logo-48.png",
-    "64": "static/img/taler-logo-64.png",
-    "128": "static/img/taler-logo-128.png",
-    "256": "static/img/taler-logo-256.png",
-    "512": "static/img/taler-logo-512.png"
-  },
   "commands": {
     "_execute_browser_action": {
       "suggested_key": {
@@ -61,4 +45,4 @@
     "page": "static/background.html",
     "persistent": true
   }
-}
\ No newline at end of file
+}
diff --git a/packages/taler-wallet-webextension/manifest-v3.json b/packages/taler-wallet-webextension/manifest-v3.json
index ca0237ba0..3ddaec513 100644
--- a/packages/taler-wallet-webextension/manifest-v3.json
+++ b/packages/taler-wallet-webextension/manifest-v3.json
@@ -1,10 +1,5 @@
 {
   "manifest_version": 3,
-  "name": "GNU Taler Wallet (git)",
-  "description": "Privacy preserving and transparent payments",
-  "author": "GNU Taler Developers",
-  "version": "0.9.0.17",
-  "version_name": "0.9.0-dev.17",
   "minimum_chrome_version": "88",
   "icons": {
     "16": "static/img/taler-logo-16.png",
diff --git a/packages/taler-wallet-webextension/pack.sh b/packages/taler-wallet-webextension/pack.sh
index 1555e51a5..ca05f36de 100755
--- a/packages/taler-wallet-webextension/pack.sh
+++ b/packages/taler-wallet-webextension/pack.sh
@@ -11,12 +11,12 @@ fi
 
 [[ "$ENV" == "prod" || "$ENV" == "dev" ]] || { echo "first argument must be prod or dev"; exit 1; }
 
-vers_manifest=$(jq -r '.version' manifest-v2.json)
+vers_manifest=$(jq -r '.version' manifest-common.json)
 
 zipfile="taler-wallet-webextension-${vers_manifest}.zip"
 
 TEMP_DIR=$(mktemp -d)
-jq '. | .name = "GNU Taler Wallet" ' manifest-v2.json > $TEMP_DIR/manifest.json
+jq -s 'add | .name = "GNU Taler Wallet" ' manifest-common.json manifest-v2.json > $TEMP_DIR/manifest.json
 cp -r dist static $TEMP_DIR
 
 find $TEMP_DIR/dist \( -name "test.*" -o -name "*.test.*" -o -name "stories.*" -o -name "*.dev.*" \) -delete
@@ -35,12 +35,10 @@ mkdir -p extension/v2/unpacked
 echo "Packed webextension: extension/v2/$zipfile"
 cp -rf src extension/v2/unpacked
 
-vers_manifest=$(jq -r '.version' manifest-v3.json)
-
 zipfile="taler-wallet-webextension-${vers_manifest}.zip"
 
 TEMP_DIR=$(mktemp -d)
-jq '. | .name = "GNU Taler Wallet" ' manifest-v3.json > $TEMP_DIR/manifest.json
+jq -s 'add | .name = "GNU Taler Wallet" ' manifest-common.json manifest-v3.json > $TEMP_DIR/manifest.json
 cp -r dist static service_worker.js $TEMP_DIR
 
 find $TEMP_DIR/dist \( -name "test.*" -o -name "*.test.*" -o -name "stories.*" -o -name "*.dev.*" \) -delete
-- 
cgit v1.2.3