did some things

6 files changed, 33 insertions, 24 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 8da626d5da72..812524534a15 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,16 +1,17 @@
 pkgbase = vscodium-bin-marketplace
 	pkgdesc = Enable vscode marketplace in vscodium-bin
 	pkgver = 1.56.0
-	pkgrel = 2
+	pkgrel = 3
 	url = https://marketplace.visualstudio.com/vscode
 	install = vscodium-bin-marketplace.install
 	arch = any
 	license = unknown
 	depends = vscodium-bin
+	depends = sed
 	source = vscodium-bin-marketplace.hook
-	source = product.json.patch
-	md5sums = 2c635fa01e6d65a08f1e6652c6ea5873
-	md5sums = d0ae4a9a6bbf2412fc67f9bd8f5ba5b5
+	source = patch.sh
+	md5sums = 3c5f596c01aec593f880031d21b949b4
+	md5sums = 9953b36f67bee0466c28a07e1faf090e
 
 pkgname = vscodium-bin-marketplace
 
diff --git a/PKGBUILD b/PKGBUILD
index e56922be9c24..97c640090651 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,19 +3,19 @@
 
 pkgname=vscodium-bin-marketplace
 pkgver=1.56.0
-pkgrel=2
+pkgrel=3
 pkgdesc='Enable vscode marketplace in vscodium-bin'
 arch=('any')
 url='https://marketplace.visualstudio.com/vscode'
 license=('unknown')
-depends=('vscodium-bin')
+depends=('vscodium-bin' 'sed')
 install="${pkgname}.install"
 source=('vscodium-bin-marketplace.hook'
-        'product.json.patch')
-md5sums=('2c635fa01e6d65a08f1e6652c6ea5873'
-         'd0ae4a9a6bbf2412fc67f9bd8f5ba5b5')
+        'patch.sh')
+md5sums=('3c5f596c01aec593f880031d21b949b4'
+         '9953b36f67bee0466c28a07e1faf090e')
 package() {
   install -Dm 644 "${srcdir}"/vscodium-bin-marketplace.hook "${pkgdir}"/usr/share/libalpm/hooks/vscodium-bin-marketplace.hook
-  install -Dm 644 "${srcdir}"/product.json.patch "${pkgdir}"/usr/share/vscodium-bin/resources/app/product.json.patch
+  install -Dm 755 "${srcdir}"/patch.sh "${pkgdir}"/usr/share/vscodium-bin/resources/app/patch.sh
 }
 
diff --git a/patch.sh b/patch.sh
new file mode 100755
index 000000000000..23015167c215
--- /dev/null
+++ b/patch.sh
@@ -0,0 +1,17 @@
+#!/usr/bin/env sh
+
+if [ "${1}" = "-R" ]; then
+  sed -i -e 's/^[[:blank:]]*"serviceUrl":.*/    "serviceUrl": "https:\/\/open-vsx.org\/vscode\/gallery",/' \
+    -e '/^[[:blank:]]*"cacheUrl/d' \
+    -e 's/^[[:blank:]]*"itemUrl":.*/    "itemUrl": "https:\/\/open-vsx.org\/vscode\/item"/' \
+    -e '/^[[:blank:]]*"linkProtectionTrustedDomains/d' \
+    -e '/^[[:blank:]]*"documentationUrl/i\  "linkProtectionTrustedDomains": ["https://open-vsx.org"],' \
+    /usr/share/vscodium-bin/resources/app/product.json
+else
+  sed -i -e 's/^[[:blank:]]*"serviceUrl":.*/    "serviceUrl": "https:\/\/marketplace.visualstudio.com\/_apis\/public\/gallery",/' \
+    -e '/^[[:blank:]]*"cacheUrl/d' \
+    -e '/^[[:blank:]]*"serviceUrl/a\    "cacheUrl": "https:\/\/vscode.blob.core.windows.net\/gallery\/index",' \
+    -e 's/^[[:blank:]]*"itemUrl":.*/    "itemUrl": "https:\/\/marketplace.visualstudio.com\/items"/' \
+    -e '/^[[:blank:]]*"linkProtectionTrustedDomains/d' \
+    /usr/share/vscodium-bin/resources/app/product.json
+fi
diff --git a/product.json.patch b/product.json.patch
deleted file mode 100644
index 11ac1fdb7071..000000000000
--- a/product.json.patch
+++ /dev/null
@@ -1,9 +0,0 @@
-154,155c154,156
-<     "serviceUrl": "https://open-vsx.org/vscode/gallery",
-<     "itemUrl": "https://open-vsx.org/vscode/item"
----
->       "serviceUrl": "https://marketplace.visualstudio.com/_apis/public/gallery",
->       "cacheUrl": "https://vscode.blob.core.windows.net/gallery/index",
->       "itemUrl": "https://marketplace.visualstudio.com/items"
-157d157
-<   "linkProtectionTrustedDomains": ["https://open-vsx.org"],
diff --git a/vscodium-bin-marketplace.hook b/vscodium-bin-marketplace.hook
index c38702a7cbde..ea45a5383b83 100644
--- a/vscodium-bin-marketplace.hook
+++ b/vscodium-bin-marketplace.hook
@@ -6,5 +6,5 @@ Target = /usr/share/vscodium-bin/resources/app/product.json
 
 [Action]
 Description = Patching product.json...
-Exec = /usr/bin/bash -c "/usr/bin/patch -Rt /usr/share/vscodium-bin/resources/app/product.json < /usr/share/vscodium-bin/resources/app/product.json.patch"
+Exec = /usr/share/vscodium-bin/resources/app/patch.sh
 When = PostTransaction
diff --git a/vscodium-bin-marketplace.install b/vscodium-bin-marketplace.install
index de468402d404..134c4e69a93b 100644
--- a/vscodium-bin-marketplace.install
+++ b/vscodium-bin-marketplace.install
@@ -1,15 +1,15 @@
 post_install() {
-  patch -Rt /usr/share/vscodium-bin/resources/app/product.json < /usr/share/vscodium-bin/resources/app/product.json.patch
+  /usr/share/vscodium-bin/resources/app/patch.sh
 }
 
 pre_upgrade() {
-  patch -Rt /usr/share/vscodium-bin/resources/app/product.json < /usr/share/vscodium-bin/resources/app/product.json.patch
+  /usr/share/vscodium-bin/resources/app/patch.sh -R
 }
 
 post_upgrade() {
-  patch -Rt /usr/share/vscodium-bin/resources/app/product.json < /usr/share/vscodium-bin/resources/app/product.json.patch
+  /usr/share/vscodium-bin/resources/app/patch.sh
 }
 
 pre_remove() {
-  patch -Rt /usr/share/vscodium-bin/resources/app/product.json < /usr/share/vscodium-bin/resources/app/product.json.patch
+  /usr/share/vscodium-bin/resources/app/patch.sh -R
 }