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

[Filipe Laíns]

    Date: Saturday, November 9, 2019 @ 18:50:08
  Author: ffy00
Revision: 524865

fix electron version (1.40.0-2)

Fixes FS#64432

Modified:
  code/trunk/PKGBUILD
  code/trunk/code.sh

----------+
 PKGBUILD |   15 ++++++++-------
 code.sh  |    2 +-
 2 files changed, 9 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-11-09 18:23:59 UTC (rev 524864)
+++ PKGBUILD	2019-11-09 18:50:08 UTC (rev 524865)
@@ -9,12 +9,13 @@
 #   - carbon: 8
 #   - dubnium: 10
 # Important: Remember to check https://github.com/microsoft/vscode/blob/master/.yarnrc (choose correct tag) for target electron version
+_electron=electron6
 pkgver=1.40.0
-pkgrel=1
+pkgrel=2
 arch=('x86_64')
 url='https://github.com/microsoft/vscode'
 license=('MIT')
-depends=('electron4' 'libsecret' 'libx11' 'libxkbfile' 'ripgrep')
+depends=($_electron 'libsecret' 'libx11' 'libxkbfile' 'ripgrep')
 optdepends=('bash-completion: Bash completions'
             'zsh-completions: ZSH completitons')
 makedepends=('git' 'gulp' 'npm' 'python2' 'yarn' 'nodejs-lts-dubnium')
@@ -25,7 +26,7 @@
         'enable-proposed-apis.diff')
 sha512sums=('SKIP'
             '814c9554427183cd893a33cd2cbe91f6e0ea71921ef0717c86217b1d3058d265f9ff7a9ace3e7b76f122e60b7686475cf4d999e581a1845face3033afb9f745f'
-            'dfd9ca38e6510c9ad59fb24c1141fdfeb136f457392aee79b0bc2ff378c4c54d81a06728ba3ec4039d57dfcd730c26686585de9b4032a21ee8151a4f05195c15'
+            '0e75ee88274cbaf48c59ef6f363f6b8ac2ea83f8b17a61155008db773b709a1f0233754fa63a136ec0417313ba90a7eb17db000ec22a38ca8840d8ba6c47cab1'
             '8ec47e497287d67f37e7b669af416f43d5cdbd4574892867d7b95996ef5de53640b5bc919b06b177e1fd91cb005579d6ed0c17325117b9914ba7cf28f5f06e40'
             'b267dcedaf51067a782d0f14007663b706973c1538f7fb91f093475134c2145fd0ffd5ed2b47ad7f01c6167a78a4af285d2818d7850fc67a7f7a473324824664')
 
@@ -51,8 +52,8 @@
 prepare() {
   cd $pkgname
 
-  # Change electron binary name to electron4
-  sed -i 's|exec electron |exec electron4 |' ../code.sh
+  # Change electron binary name to the target electron
+  sed -i "s|exec electron |exec $_electron |" ../code.sh
 
   # This patch no longer contains proprietary modifications.
   # See https://github.com/Microsoft/vscode/issues/31168 for details.
@@ -68,7 +69,7 @@
   patch -p1 < ../enable-proposed-apis.diff
 
   # Build native modules for system electron
-  local _target=$(</usr/lib/electron4/version)
+  local _target=$(</usr/lib/$_electron/version)
   sed -i "s/^target .*/target \"${_target//v/}\"/" .yarnrc
 
   # Patch appdata and desktop file
@@ -125,7 +126,7 @@
   install -dm 755 "$pkgdir"/usr/lib/$pkgname
   cp -r --no-preserve=ownership --preserve=mode VSCode-linux-$_vscode_arch/resources/app/* "$pkgdir"/usr/lib/$pkgname/
 
-  # replace statically included binary with system copy
+  # Replace statically included binary with system copy
   ln -sf /usr/bin/rg "$pkgdir"/usr/lib/code/node_modules.asar.unpacked/vscode-ripgrep/bin/rg
 
   # Install binary

Modified: code.sh
===================================================================
--- code.sh	2019-11-09 18:23:59 UTC (rev 524864)
+++ code.sh	2019-11-09 18:50:08 UTC (rev 524865)
@@ -1,3 +1,3 @@
 #!/bin/bash
 
-ELECTRON_RUN_AS_NODE=1 exec electron4 /usr/lib/code/out/cli.js /usr/lib/code/code.js "$@"
+ELECTRON_RUN_AS_NODE=1 exec electron /usr/lib/code/out/cli.js /usr/lib/code/code.js "$@"