X-Git-Url: https://git.distorted.org.uk/~mdw/termux-packages/blobdiff_plain/1195f4264ce85b1ddf26458cc1af96e55f7e7601..39e1491309d896bb34ad40a96fdd8356447c463a:/packages/fzf/build.sh

diff --git a/packages/fzf/build.sh b/packages/fzf/build.sh
index 43ff512b..441f4b1c 100644
--- a/packages/fzf/build.sh
+++ b/packages/fzf/build.sh
@@ -1,33 +1,18 @@
 TERMUX_PKG_HOMEPAGE=https://github.com/junegunn/fzf
 TERMUX_PKG_DESCRIPTION="Command-line fuzzy finder"
-TERMUX_PKG_VERSION=0.12.2
+TERMUX_PKG_VERSION=0.16.1
 TERMUX_PKG_SRCURL=https://github.com/junegunn/fzf/archive/${TERMUX_PKG_VERSION}.tar.gz
-TERMUX_PKG_FOLDERNAME=fzf-${TERMUX_PKG_VERSION}
+TERMUX_PKG_FOLDERNAME=fzf-$TERMUX_PKG_VERSION
 TERMUX_PKG_BUILD_IN_SRC="yes"
 TERMUX_PKG_DEPENDS="bash, ncurses"
 
 termux_step_make_install () {
-	export GOPATH=$TERMUX_PKG_TMPDIR
-	cd $GOPATH
-	mkdir -p src/github.com/junegunn/fzf
-	cp -Rf $TERMUX_PKG_SRCDIR/* src/github.com/junegunn/fzf
-
 	termux_setup_golang
-	export CGO_CFLAGS="-I$TERMUX_PREFIX/include -L$TERMUX_PREFIX/lib"
+	export CGO_CFLAGS="-I$TERMUX_PREFIX/include"
 	export CGO_LDFLAGS="-L$TERMUX_PREFIX/lib"
 
-	mkdir -p $GOPATH/src/github.com/junegunn/fzf/src/vendor/github.com/junegunn/{go-runewidth,go-shellwords}
-	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
-	done
-	for file in shellwords.go util_posix.go; do
-		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
-
-	cd $GOPATH/src/github.com/junegunn/fzf/src/fzf
-	CGO_ENABLED=1 go build -a -ldflags="-extldflags=-pie" -o $TERMUX_PREFIX/bin/fzf
+	cd $TERMUX_PKG_SRCDIR/src
+	make android-build
 
 	# Install fzf-tmux, a bash script for launching fzf in a tmux pane:
 	cp $TERMUX_PKG_SRCDIR/bin/fzf-tmux $TERMUX_PREFIX/bin
@@ -37,8 +22,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 +36,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
 }