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

[Sven-Hendrik Haase]

    Date: Friday, September 4, 2020 @ 12:30:19
  Author: svenstaro
Revision: 698496

Use more precise way of getting completions dir

Modified:
  ripgrep/trunk/PKGBUILD

----------+
 PKGBUILD |   14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-09-04 12:12:23 UTC (rev 698495)
+++ PKGBUILD	2020-09-04 12:30:19 UTC (rev 698496)
@@ -3,13 +3,13 @@
 # Contributor: Andrew Gallant <jamslam at gmail.com>
 pkgname=ripgrep
 pkgver=12.1.1
-pkgrel=1
+pkgrel=2
 pkgdesc="A search tool that combines the usability of ag with the raw speed of grep"
 arch=('x86_64')
 url="https://github.com/BurntSushi/ripgrep"
 license=('MIT' 'custom')
 depends=('gcc-libs' 'pcre2')
-makedepends=('cargo' 'asciidoctor')
+makedepends=('cargo' 'asciidoctor' 'jq')
 source=("$pkgname-$pkgver.tar.gz::https://github.com/BurntSushi/$pkgname/archive/$pkgver.tar.gz")
 sha512sums=('9e2a16043be6c7727d49a44f6db7fdb41413efc869139186729985ff86dee5c6531c663352f4019b730eb3a6c46f26d46df3738d4a0cbbc39ab773f320eb9e59')
 
@@ -28,14 +28,16 @@
 package() {
   cd "$pkgname-$pkgver"
 
+  OUT_DIR="$(cargo build --release --locked --message-format=json-render-diagnostics | \
+      jq -r 'select(.out_dir) | select(.package_id | startswith("ripgrep ")) | .out_dir')"
+
   install -Dm755 "target/release/rg" "$pkgdir/usr/bin/rg"
 
   install -Dm644 "complete/_rg" "$pkgdir/usr/share/zsh/site-functions/_rg"
-  local target_dir=$(ls target/release/build/ripgrep-*/out/rg.bash | head -n1 | xargs dirname)
-  install -Dm644 "$target_dir"/rg.bash "$pkgdir/usr/share/bash-completion/completions/rg"
+  install -Dm644 "$OUT_DIR"/rg.bash "$pkgdir/usr/share/bash-completion/completions/rg"
   # NOTE: Fish completions will be removed in v13
-  install -Dm644 "$target_dir"/rg.fish "$pkgdir/usr/share/fish/vendor_completions.d/rg.fish"
-  install -Dm644 "$target_dir"/rg.1 "$pkgdir/usr/share/man/man1/rg.1"
+  install -Dm644 "$OUT_DIR"/rg.fish "$pkgdir/usr/share/fish/vendor_completions.d/rg.fish"
+  install -Dm644 "$OUT_DIR"/rg.1 "$pkgdir/usr/share/man/man1/rg.1"
 
   install -Dm644 "README.md" "$pkgdir/usr/share/doc/${pkgname}/README.md"
   install -Dm644 "COPYING" "$pkgdir/usr/share/licenses/${pkgname}/COPYING"