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

[Maxim Baz]

    Date: Monday, January 10, 2022 @ 14:52:25
  Author: maximbaz
Revision: 1099314

kitty: 0.24.1, extract shell-integration pkg, fix FS#73251

Modified:
  kitty/trunk/PKGBUILD

----------+
 PKGBUILD |   23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-01-10 14:51:37 UTC (rev 1099313)
+++ PKGBUILD	2022-01-10 14:52:25 UTC (rev 1099314)
@@ -4,8 +4,8 @@
 # Contributor: Maximilian Kindshofer <maximilian at kindshofer.net>
 
 pkgbase=kitty
-pkgname=(kitty kitty-terminfo)
-pkgver=0.24.0
+pkgname=(kitty kitty-terminfo kitty-shell-integration)
+pkgver=0.24.1
 pkgrel=1
 pkgdesc="A modern, hackable, featureful, OpenGL-based terminal emulator"
 arch=('x86_64')
@@ -16,7 +16,7 @@
 makedepends=('libxinerama' 'libxcursor' 'libxrandr' 'wayland-protocols' 'librsync')
 source=("${pkgname}-${pkgver}.tar.xz::https://github.com/kovidgoyal/${pkgbase}/releases/download/v${pkgver}/${pkgbase}-${pkgver}.tar.xz"
         "${pkgname}-${pkgver}.tar.xz.sig::https://github.com/kovidgoyal/${pkgbase}/releases/download/v${pkgver}/${pkgbase}-${pkgver}.tar.xz.sig")
-sha512sums=('b851ed56d16f9a39d47810bf27c2bc8cbb52d476376c4090045db90c1ad0bc7db6fd9e97edd6ce50a6d69e716671e1e909aab889ecac368857ad5c07f68a76af'
+sha512sums=('e590a3abd4ed38ce956ee1e1b9d3679150c83b80df5ed9daf9773d7a278f63dc8a3a563058906d322f9186bece7d479036a502864fd80f45593c4970c056f389'
             'SKIP')
 validpgpkeys=('3CE1780F78DD88DF45194FD706BC317B515ACE7C') # Kovid Goyal
 
@@ -26,7 +26,7 @@
 }
 
 package_kitty() {
-  depends+=('kitty-terminfo')
+  depends+=('kitty-terminfo' 'kitty-shell-integration')
   optdepends=('imagemagick: viewing images with icat'
               'libcanberra: playing "bell" sound on terminal bell')
 
@@ -37,16 +37,12 @@
   # completions
   python __main__.py + complete setup bash | install -Dm644 /dev/stdin "${pkgdir}"/usr/share/bash-completion/completions/kitty
   python __main__.py + complete setup fish | install -Dm644 /dev/stdin "${pkgdir}"/usr/share/fish/vendor_completions.d/kitty.fish
-  # doesn't know how to http://zsh.sourceforge.net/Doc/Release/Completion-System.html#Autoloaded-files
-  # so we write our own header
-  {
-      echo "#compdef kitty"
-      python __main__.py + complete setup zsh
-  } | install -Dm644 /dev/stdin "${pkgdir}"/usr/share/zsh/site-functions/_kitty
+  python __main__.py + complete setup zsh  | install -Dm644 /dev/stdin "${pkgdir}"/usr/share/zsh/site-functions/_kitty
 
   install -Dm644 "${pkgdir}"/usr/share/icons/hicolor/256x256/apps/kitty.png "${pkgdir}"/usr/share/pixmaps/kitty.png
 
   rm -r "$pkgdir"/usr/share/terminfo
+  rm -r "$pkgdir"/usr/lib/kitty/shell-integration
 
   install -Dm644 docs/_build/html/_downloads/*/kitty.conf "${pkgdir}"/usr/share/doc/${pkgname}/kitty.conf
 }
@@ -58,3 +54,10 @@
   mkdir -p "$pkgdir/usr/share/terminfo"
   tic -x -o "$pkgdir/usr/share/terminfo" $pkgbase-$pkgver/terminfo/kitty.terminfo
 }
+
+package_kitty-shell-integration() {
+  pkgdesc='Shell integration scripts for kitty, an OpenGL-based terminal emulator'
+
+  mkdir -p "$pkgdir/usr/lib/kitty/"
+  cp -r "$srcdir/$pkgbase-$pkgver/shell-integration" "$pkgdir/usr/lib/kitty/"
+}