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

[Eli Schwartz]

    Date: Thursday, November 29, 2018 @ 03:38:02
  Author: eschwartz
Revision: 410498

upgpkg: code 1.29.1-3

use system ripgrep

Modified:
  code/trunk/PKGBUILD

----------+
 PKGBUILD |    7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-11-29 02:07:37 UTC (rev 410497)
+++ PKGBUILD	2018-11-29 03:38:02 UTC (rev 410498)
@@ -5,11 +5,11 @@
 pkgname=code
 pkgdesc='The Open Source build of Visual Studio Code (vscode) editor'
 pkgver=1.29.1
-pkgrel=2
+pkgrel=3
 arch=('x86_64')
 url='https://github.com/Microsoft/vscode'
 license=('MIT')
-depends=('electron' 'libsecret' 'libxkbfile')
+depends=('electron' 'libsecret' 'libxkbfile' 'ripgrep')
 # doesn't build without old nodejs: https://github.com/Microsoft/vscode/issues/49292
 makedepends=('git' 'gulp' 'npm' 'python2' 'yarn' 'nodejs-lts-carbon')
 source=("$pkgname::git+https://github.com/Microsoft/vscode.git#tag=$pkgver"
@@ -102,6 +102,9 @@
   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
+  ln -sf /usr/bin/rg "$pkgdir"/usr/lib/code/node_modules.asar.unpacked/vscode-ripgrep/bin/rg
+
   # Install binary
   install -Dm 755 code.sh "$pkgdir"/usr/bin/code-oss
   install -Dm 755 code.js "$pkgdir"/usr/lib/$pkgname/code.js