[arch-commits] Commit in fzf/trunk (4 files)

Pierre Neidhardt ambrevar at archlinux.org
Mon Jul 11 08:13:01 UTC 2016


    Date: Monday, July 11, 2016 @ 08:13:01
  Author: ambrevar
Revision: 182642

upgpkg: fzf 0.13.2-2

Modified:
  fzf/trunk/PKGBUILD
  fzf/trunk/fzf.install
Deleted:
  fzf/trunk/key-bindings.bash.patch
  fzf/trunk/key-bindings.zsh.patch

-------------------------+
 PKGBUILD                |   29 +++++++----------------------
 fzf.install             |   16 +++++++++-------
 key-bindings.bash.patch |   11 -----------
 key-bindings.zsh.patch  |   12 ------------
 4 files changed, 16 insertions(+), 52 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-07-11 07:54:17 UTC (rev 182641)
+++ PKGBUILD	2016-07-11 08:13:01 UTC (rev 182642)
@@ -1,4 +1,5 @@
 # Maintainer: Pierre Neidhardt <ambrevar at gmail.com>
+# Contributor: Hermann Zahnweh (eigengrau)
 # Contributor: Andy Weidenbaum <archbaum at gmail.com>
 # Contributor: foalsrock <foalsrock at gmail dot-com>
 # Contributor: jebaum <jebaum at ucla dot edu>
@@ -5,7 +6,7 @@
 
 pkgname=fzf
 pkgver=0.13.2
-pkgrel=1
+pkgrel=2
 pkgdesc="Command-line fuzzy finder"
 arch=("i686" "x86_64")
 url="https://github.com/junegunn/fzf"
@@ -19,22 +20,10 @@
 	"zsh: zsh keybindings")
 install="fzf.install"
 source=("$pkgname-$pkgver.tar.gz::https://github.com/junegunn/fzf/archive/$pkgver.tar.gz"
-	"git+https://github.com/junegunn/$pkgname.wiki"
-	"key-bindings.bash.patch"
-	"key-bindings.zsh.patch")
+	"git+https://github.com/junegunn/$pkgname.wiki")
 sha256sums=('063c2e0e23944acead08e90a33ebce0d5d1c05b168571f56800b3b2ddf7c5ee9'
-            'SKIP'
-            'fc981d036d85d0b9a5e6ba65f84b1c0f86bcee2dabb09238e1edfa1f49a85b63'
-            '0b89bf1d6d372b9a8d5927e58151157d42848086a252979006b89b72242c52e6')
+            'SKIP')
 
-prepare() {
-	cd "$srcdir/$pkgname-$pkgver"
-
-	msg2 "Patching bash and zsh key bindings..."
-	patch -p1 < "$srcdir/key-bindings.bash.patch"
-	patch -p1 < "$srcdir/key-bindings.zsh.patch"
-}
-
 build() {
 	cd "$srcdir/$pkgname-$pkgver"
 
@@ -60,14 +49,10 @@
 	install -dm755 "$pkgdir/usr/bin"
 	install -m755 "$srcdir/bin/fzf" "bin/fzf-tmux" "$pkgdir/usr/bin/"
 
-	## Bash completion and keybindings
-	install -Dm644 "shell/completion.bash" "$pkgdir/usr/share/bash-completion/completions/fzf"
-	install -Dm755 "shell/key-bindings.bash" "$pkgdir/usr/share/fzf/key-bindings.bash"
+	## Completion and keybindings
+	install -dm755 "$pkgdir/usr/share/fzf"
+	install -m644 shell/*.bash shell/*.zsh "$pkgdir/usr/share/fzf"
 
 	## Fish keybindings
 	install -Dm644 "shell/key-bindings.fish" "$pkgdir/usr/share/fish/functions/fzf.fish"
-
-	## Zsh completion and keybindings
-	install -Dm644 "shell/completion.zsh" "$pkgdir/usr/share/zsh/site-functions/_fzf"
-	install -Dm755 "shell/key-bindings.zsh" "$pkgdir/usr/share/fzf/key-bindings.zsh"
 }

Modified: fzf.install
===================================================================
--- fzf.install	2016-07-11 07:54:17 UTC (rev 182641)
+++ fzf.install	2016-07-11 08:13:01 UTC (rev 182642)
@@ -1,16 +1,15 @@
 post_install() {
 	cat<<'EOF'
-Optional fzf keybindings have been placed here:
+Optional fzf keybindings and completion are available to bash and zsh:
+For bash:
 
-    /usr/share/fzf
-
-To utilize, add the following to your bash config:
-
     . /usr/share/fzf/key-bindings.bash
+    . /usr/share/fzf/completion.bash
 
-Or for zsh, add the following to your config:
+For zsh:
 
     . /usr/share/fzf/key-bindings.zsh
+    . /usr/share/fzf/completion.zsh
 
 For fish, keybindings are in
 
@@ -21,5 +20,8 @@
 }
 
 post_upgrade() {
-  echo "The keybindings have been moved to /usr/share/fzf"
+	cat<<EOF
+The keybinding and completion files have been moved to /usr/share/fzf.
+Those files are no more automatically parsed.
+EOF
 }

Deleted: key-bindings.bash.patch
===================================================================
--- key-bindings.bash.patch	2016-07-11 07:54:17 UTC (rev 182641)
+++ key-bindings.bash.patch	2016-07-11 08:13:01 UTC (rev 182642)
@@ -1,11 +0,0 @@
---- ./shell/key-bindings.bash	2015-10-05 07:52:39.421599247 -0700
-+++ ./shell/key-bindings.bash	2015-10-05 07:52:57.124933562 -0700
-@@ -1,3 +1,8 @@
-+# Auto-completion
-+# ---------------
-+[[ $- =~ i && -f /usr/share/bash-completion/completions/fzf ]] \
-+  && source /usr/share/bash-completion/completions/fzf
-+
- # Key bindings
- # ------------
- __fzf_select__() {

Deleted: key-bindings.zsh.patch
===================================================================
--- key-bindings.zsh.patch	2016-07-11 07:54:17 UTC (rev 182641)
+++ key-bindings.zsh.patch	2016-07-11 08:13:01 UTC (rev 182642)
@@ -1,12 +0,0 @@
---- ./shell/key-bindings.zsh	2015-10-05 07:53:13.168267783 -0700
-+++ ./shell/key-bindings.zsh	2015-10-05 07:53:32.584935525 -0700
-@@ -1,3 +1,9 @@
-+# Auto-completion
-+# ---------------
-+if [[ -f /usr/share/zsh/site-functions/_fzf ]]; then
-+  source /usr/share/zsh/site-functions/_fzf
-+fi
-+
- # Key bindings
- # ------------
- if [[ $- == *i* ]]; then



More information about the arch-commits mailing list