X-Git-Url: https://git.distorted.org.uk/~mdw/termux-packages/blobdiff_plain/71963d19cc1e0821536212e8c5057e40b5db9ba8..a9cd51d25744f6a50d32470f596ae48bb0d3f2ea:/packages/fzf/build.sh

diff --git a/packages/fzf/build.sh b/packages/fzf/build.sh
index 768bf82e..06c48c1e 100644
--- a/packages/fzf/build.sh
+++ b/packages/fzf/build.sh
@@ -1,8 +1,12 @@
 TERMUX_PKG_HOMEPAGE=https://github.com/junegunn/fzf
 TERMUX_PKG_DESCRIPTION="Command-line fuzzy finder"
-TERMUX_PKG_VERSION=0.11.4
-TERMUX_PKG_SRCURL=https://github.com/junegunn/fzf/archive/${TERMUX_PKG_VERSION}.tar.gz
-TERMUX_PKG_FOLDERNAME=fzf-${TERMUX_PKG_VERSION}
+# Use git master until next release with https://github.com/junegunn/fzf/pull/768
+TERMUX_PKG_VERSION=0.15.9.1
+_COMMIT=847c512539f9909ae69a5067c1a64cb9bb485ea3
+# TERMUX_PKG_SRCURL=https://github.com/junegunn/fzf/archive/${TERMUX_PKG_VERSION}.tar.gz
+# TERMUX_PKG_FOLDERNAME=fzf-${TERMUX_PKG_VERSION}
+TERMUX_PKG_SRCURL=https://github.com/junegunn/fzf/archive/$_COMMIT.zip
+TERMUX_PKG_FOLDERNAME=fzf-$_COMMIT
 TERMUX_PKG_BUILD_IN_SRC="yes"
 TERMUX_PKG_DEPENDS="bash, ncurses"
 
@@ -16,7 +20,7 @@ termux_step_make_install () {
 	export CGO_CFLAGS="-I$TERMUX_PREFIX/include -L$TERMUX_PREFIX/lib"
 	export CGO_LDFLAGS="-L$TERMUX_PREFIX/lib"
 
-	mkdir -p $GOPATH/src/github.com/junegunn/fzf/src/vendor/github.com/junegunn/{go-runewidth,go-shellwords}
+	mkdir -p $GOPATH/src/github.com/junegunn/fzf/src/vendor/github.com/junegunn/{go-runewidth,go-shellwords,go-isatty}
 	for file in runewidth.go runewidth_posix.go; do
 		curl -o $GOPATH/src/github.com/junegunn/fzf/src/vendor/github.com/junegunn/go-runewidth/$file \
 		        https://raw.githubusercontent.com/junegunn/go-runewidth/master/$file
@@ -25,6 +29,8 @@ termux_step_make_install () {
 		curl -o $GOPATH/src/github.com/junegunn/fzf/src/vendor/github.com/junegunn/go-shellwords/$file \
 		        https://raw.githubusercontent.com/junegunn/go-shellwords/master/$file
 	done
+	curl -o $GOPATH/src/github.com/junegunn/fzf/src/vendor/github.com/junegunn/go-isatty/isatty_linux.go \
+	        https://raw.githubusercontent.com/junegunn/go-isatty/master/isatty_linux.go
 
 	cd $GOPATH/src/github.com/junegunn/fzf/src/fzf
 	CGO_ENABLED=1 go build -a -ldflags="-extldflags=-pie" -o $TERMUX_PREFIX/bin/fzf
@@ -37,8 +43,12 @@ termux_step_make_install () {
 	cp $TERMUX_PKG_SRCDIR/man/man1/fzf.1 $TERMUX_PREFIX/share/man/man1/
 
 	# Install the vim plugin:
-	mkdir -p $TERMUX_PREFIX/share/vim/vim74/plugin
-	cp $TERMUX_PKG_SRCDIR/plugin/fzf.vim $TERMUX_PREFIX/share/vim/vim74/plugin/fzf.vim
+	mkdir -p $TERMUX_PREFIX/share/vim/vim80/plugin
+	cp $TERMUX_PKG_SRCDIR/plugin/fzf.vim $TERMUX_PREFIX/share/vim/vim80/plugin/fzf.vim
+
+	# Install bash, zsh and fish helper scripts:
+	mkdir -p "$TERMUX_PREFIX/share/fzf"
+	cp $TERMUX_PKG_SRCDIR/shell/* "$TERMUX_PREFIX/share/fzf"
 
 	# Install the nvim plugin:
 	mkdir -p $TERMUX_PREFIX/share/nvim/runtime/plugin
@@ -47,5 +57,5 @@ termux_step_make_install () {
 
 termux_step_post_massage () {
 	# Remove so that the vim build doesn't add it to vim-runtime:
-	rm $TERMUX_PREFIX/share/vim/vim74/plugin/fzf.vim
+	rm $TERMUX_PREFIX/share/vim/vim80/plugin/fzf.vim
 }