[arch-commits] Commit in code/trunk (PKGBUILD code-liveshare.diff code.js code.sh)

[Filipe Laíns]

    Date: Sunday, May 16, 2021 @ 15:24:50
  Author: ffy00
Revision: 935858

fix cli script using electron11 instead of 12 (1.56.2-2)

Modified:
  code/trunk/PKGBUILD
  code/trunk/code.js
  code/trunk/code.sh
Deleted:
  code/trunk/code-liveshare.diff

---------------------+
 PKGBUILD            |    7 ++++---
 code-liveshare.diff |   12 ------------
 code.js             |    3 ++-
 code.sh             |    3 ++-
 4 files changed, 8 insertions(+), 17 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-05-16 15:22:56 UTC (rev 935857)
+++ PKGBUILD	2021-05-16 15:24:50 UTC (rev 935858)
@@ -13,7 +13,7 @@
 # Important: Remember to check https://github.com/microsoft/vscode/blob/master/.yarnrc (choose correct tag) for target electron version
 _electron=electron
 pkgver=1.56.2
-pkgrel=1
+pkgrel=2
 arch=('x86_64')
 url='https://github.com/microsoft/vscode'
 license=('MIT')
@@ -28,8 +28,8 @@
         'code.sh'
         'product_json.diff')
 sha512sums=('SKIP'
-            '17a9f9e49d75ca0ee4bc74fb4b1fa0c7c18c72efcf81da3d0ac3a01fa40b175cfd5e9b3a74df2d0938cd1ccaec3b8325774a03701b225f08b192fd89a72e680a'
-            'e3e9fbce77afe74c6b489cd9668bacb4ba5750b100dc60377c59b307a5daf479a9f9422a0fefaeb1da5f92cd00454c139af0155f7fda2d3e45a5f36f336e5608'
+            '6e8ee1df4dd982434a8295ca99e786a536457c86c34212546e548b115081798c5492a79f99cd5a3f1fa30fb71d29983aaabc2c79f4895d4a709d8354e9e2eade'
+            'b8bdb0e53cf8748140ed444c9b02cb6a57a7e1e120d96861d4cc9f79744a987f0253c052a238c78aa2c3f86459c4afb6f3b687435f0588d8f640822a9908b257'
             'b1aa0d7c5b3e3e8ba1172822d75ea38e90efc431b270e0b4ca9e45bf9c0be0f60922c8618969ef071b5b6dbd9ac9f030294f1bf49bcc28c187b46d113dca63a7')
 
 # Even though we don't officially support other archs, let's
@@ -56,6 +56,7 @@
 
   # Change electron binary name to the target electron
   sed -i "s|exec electron |exec $_electron |" ../code.sh
+  sed -i "s|#!/usr/bin/electron|#!/usr/bin/$_electron|" ../code.js
 
   # This patch no longer contains proprietary modifications.
   # See https://github.com/Microsoft/vscode/issues/31168 for details.

Deleted: code-liveshare.diff
===================================================================
--- code-liveshare.diff	2021-05-16 15:22:56 UTC (rev 935857)
+++ code-liveshare.diff	2021-05-16 15:24:50 UTC (rev 935858)
@@ -1,12 +0,0 @@
-diff --git a/product.json b/product.json
-index b250c66fc4..8a9befcfbb 100644
---- a/product.json
-+++ b/product.json
-@@ -19,6 +19,7 @@
- 	"reportIssueUrl": "https://github.com/Microsoft/vscode/issues/new",
- 	"urlProtocol": "code-oss",
- 	"extensionAllowedProposedApi": [
-+		"ms-vsliveshare.vsliveshare",
- 		"ms-vscode.references-view"
- 	],
- 	"quality": "stable",

Modified: code.js
===================================================================
--- code.js	2021-05-16 15:22:56 UTC (rev 935857)
+++ code.js	2021-05-16 15:24:50 UTC (rev 935858)
@@ -1,4 +1,5 @@
-#!/usr/bin/electron11
+#!/usr/bin/electron
+// don't edit the electron binary name here! simply change the variable in the PKGBUILD and we will sed it into the correct one :)
 
 const name = 'code-oss';
 

Modified: code.sh
===================================================================
--- code.sh	2021-05-16 15:22:56 UTC (rev 935857)
+++ code.sh	2021-05-16 15:24:50 UTC (rev 935858)
@@ -1,3 +1,4 @@
 #!/bin/bash
 
-ELECTRON_RUN_AS_NODE=1 exec electron11 /usr/lib/code/out/cli.js /usr/lib/code/code.js "$@"
+# don't edit the electron binary name here! simply change the variable in the PKGBUILD and we will sed it into the correct one :)
+ELECTRON_RUN_AS_NODE=1 exec electron /usr/lib/code/out/cli.js /usr/lib/code/code.js "$@"