revert

7 files changed, 18 insertions, 77 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 68bd45e0eb2e..713ca9907c0d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,20 +1,16 @@
 pkgbase = code-marketplace
-	pkgdesc = Enable vscode marketplace in Code OSS and VSCodium
+	pkgdesc = Enable vscode marketplace in Code OSS
 	pkgver = 1.50.1
 	pkgrel = 1
 	url = https://marketplace.visualstudio.com/vscode
 	install = code-marketplace.install
 	arch = any
 	license = unknown
-	depends = code
+	depends = code>=1.50.1
 	source = code-marketplace.hook
-	source = patch.sh
-	source = code.patch
-	source = vscodium-bin.patch
-	md5sums = 86f0c2bc60b5843a41fd9d2f8bab0b5a
-	md5sums = 5c3a49895d2d29a1878e8b9ba5764ef0
-	md5sums = 0fe49bf0ff5d74f632bf3b5d435750ab
-	md5sums = 060a4fc39945ca3c5a5c9e8136c343ad
+	source = product_json.patch
+	md5sums = 8a5cbd751ee2762d40f1e43e9e6e69e0
+	md5sums = 9e476c8aae4243010d6a1c18e56ac402
 
 pkgname = code-marketplace
 
diff --git a/PKGBUILD b/PKGBUILD
index 1ee09c7df6d9..6eb722b5737f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,24 +2,18 @@
 pkgname=code-marketplace
 pkgver=1.50.1
 pkgrel=1
-pkgdesc='Enable vscode marketplace in Code OSS and VSCodium'
+pkgdesc='Enable vscode marketplace in Code OSS'
 arch=('any')
 url='https://marketplace.visualstudio.com/vscode'
 license=('unknown')
-depends=('code')
+depends=('code>=1.50.1')
 install="${pkgname}.install"
 source=('code-marketplace.hook'
-        'patch.sh'
-        'code.patch'
-        'vscodium-bin.patch')
-md5sums=('86f0c2bc60b5843a41fd9d2f8bab0b5a'
-         '5c3a49895d2d29a1878e8b9ba5764ef0'
-         '0fe49bf0ff5d74f632bf3b5d435750ab'
-         '060a4fc39945ca3c5a5c9e8136c343ad')
+        'product_json.patch')
+md5sums=('8a5cbd751ee2762d40f1e43e9e6e69e0'
+         '9e476c8aae4243010d6a1c18e56ac402')
 
 package() {
   install -Dm 644 "${srcdir}"/code-marketplace.hook "${pkgdir}"/usr/share/libalpm/hooks/code-marketplace.hook
-  install -Dm 755 "${srcdir}"/patch.sh "${pkgdir}"/usr/share/code-marketplace/patch.sh
-  install -Dm 644 "${srcdir}"/code.patch "${pkgdir}"/usr/share/code-marketplace/code.patch
-  install -Dm 644 "${srcdir}"/vscodium-bin.patch "${pkgdir}"/usr/share/code-marketplace/vscodium-bin.patch
+  install -Dm 644 "${srcdir}"/product_json.patch "${pkgdir}"/usr/lib/code/product_json.patch
 }
diff --git a/code-marketplace.hook b/code-marketplace.hook
index f9923b2445c0..5e685e15dd88 100644
--- a/code-marketplace.hook
+++ b/code-marketplace.hook
@@ -3,9 +3,8 @@ Operation = Install
 Operation = Upgrade
 Type = Path
 Target = usr/lib/code/product.json
-Target = usr/share/vscodium-bin/resources/app/product.json
 
 [Action]
 Description = Patching product.json...
-Exec = /usr/share/code-marketplace/patch.sh
+Exec = /usr/bin/bash -c "/usr/bin/patch /usr/lib/code/product.json < /usr/lib/code/product_json.patch"
 When = PostTransaction
diff --git a/code-marketplace.install b/code-marketplace.install
index 32558cf1f982..7cf2ebcd3c35 100644
--- a/code-marketplace.install
+++ b/code-marketplace.install
@@ -1,31 +1,15 @@
 post_install() {
-  if [ -f /usr/lib/code/product.json ]; then
-    patch /usr/lib/code/product.json </usr/share/code-marketplace/code.patch
-  elif [ -f /usr/share/vscodium-bin/resources/app/product.json ]; then
-    patch /usr/share/vscodium-bin/resources/app/product.json </usr/share/code-marketplace/vscodium-bin.patch
-  fi
+  patch /usr/lib/code/product.json < /usr/lib/code/product_json.patch
 }
 
 pre_upgrade() {
-  if [ -f /usr/lib/code/product.json ]; then
-    patch -R /usr/lib/code/product.json </usr/share/code-marketplace/code.patch
-  elif [ -f /usr/share/vscodium-bin/resources/app/product.json ]; then
-    patch -R /usr/share/vscodium-bin/resources/app/product.json </usr/share/code-marketplace/vscodium-bin.patch
-  fi
+  patch -R /usr/lib/code/product.json < /usr/lib/code/product_json.patch
 }
 
 post_upgrade() {
-  if [ -f /usr/lib/code/product.json ]; then
-    patch /usr/lib/code/product.json </usr/share/code-marketplace/code.patch
-  elif [ -f /usr/share/vscodium-bin/resources/app/product.json ]; then
-    patch /usr/share/vscodium-bin/resources/app/product.json </usr/share/code-marketplace/vscodium-bin.patch
-  fi
+  patch /usr/lib/code/product.json < /usr/lib/code/product_json.patch
 }
 
 pre_remove() {
-  if [ -f /usr/lib/code/product.json ]; then
-    patch -R /usr/lib/code/product.json </usr/share/code-marketplace/code.patch
-  elif [ -f /usr/share/vscodium-bin/resources/app/product.json ]; then
-    patch -R /usr/share/vscodium-bin/resources/app/product.json </usr/share/code-marketplace/vscodium-bin.patch
-  fi
+  patch -R /usr/lib/code/product.json < /usr/lib/code/product_json.patch
 }
diff --git a/patch.sh b/patch.sh
deleted file mode 100755
index 4faac2dc7986..000000000000
--- a/patch.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/usr/bin/env sh
-
-if [ -f /usr/lib/code/product.json ]; then
-  patch /usr/lib/code/product.json </usr/share/code-marketplace/code.patch
-elif [ -f /usr/share/vscodium-bin/resources/app/product.json ]; then
-  patch /usr/share/vscodium-bin/resources/app/product.json </usr/share/code-marketplace/vscodium-bin.patch
-fi
diff --git a/code.patch b/product_json.patch
index efe2045e6e54..ff3b8ec1854e 100644
--- a/code.patch
+++ b/product_json.patch
@@ -1,5 +1,5 @@
---- /usr/lib/code/product.json	2020-10-15 18:25:40.000000000 +0800
-+++ product.json	2020-10-28 21:19:42.844503712 +0800
+--- product.json	2020-10-15 18:25:40.000000000 +0800
++++ /usr/lib/code/product.json	2020-10-28 21:19:42.844503712 +0800
 @@ -1,10 +1,10 @@
  {
  	"quality": "stable",
diff --git a/vscodium-bin.patch b/vscodium-bin.patch
deleted file mode 100644
index a5c347c8d468..000000000000
--- a/vscodium-bin.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- /usr/share/vscodium-bin/resources/app/product.json	2020-12-04 15:56:10.000000000 +0800
-+++ product.json	2020-12-04 16:03:53.732183038 +0800
-@@ -1,10 +1,10 @@
- {
-   "serverDataFolderName": ".vscode-server-oss",
--  "linkProtectionTrustedDomains": ["https://open-vsx.org"],
--  "extensionsGallery": {
--    "itemUrl": "https://open-vsx.org/vscode/item",
--    "serviceUrl": "https://open-vsx.org/vscode/gallery"
--  },
-+	"extensionsGallery": {
-+		"serviceUrl": "https://marketplace.visualstudio.com/_apis/public/gallery",
-+		"cacheUrl": "https://vscode.blob.core.windows.net/gallery/index",
-+		"itemUrl": "https://marketplace.visualstudio.com/items"
-+	},
-   "quality": "stable",
-   "keyboardShortcutsUrlWin": "https://go.microsoft.com/fwlink/?linkid=832145",
-   "keyboardShortcutsUrlLinux": "https://go.microsoft.com/fwlink/?linkid=832144",
-@@ -152,4 +152,4 @@
-     "vs/code/electron-browser/workbench/workbench.html": "DCAx76TE79oJvbVEouBCXQ",
-     "vs/code/electron-browser/workbench/workbench.js": "QmbzxZoyrJnqFRW9jKugHQ"
-   }
--}
-\ No newline at end of file
-+}