X-Git-Url: https://git.distorted.org.uk/~mdw/termux-packages/blobdiff_plain/9a653b4634befb4b6cf76db5e69cbcf2cbe0f440..f9fc47c910efe5e213928dfb67b4fea07b50f36e:/packages/fzf/build.sh

diff --git a/packages/fzf/build.sh b/packages/fzf/build.sh
index 6bb6ed62..5b9a6048 100644
--- a/packages/fzf/build.sh
+++ b/packages/fzf/build.sh
@@ -1,32 +1,38 @@
 TERMUX_PKG_HOMEPAGE=https://github.com/junegunn/fzf
 TERMUX_PKG_DESCRIPTION="Command-line fuzzy finder"
-TERMUX_PKG_VERSION=0.11.1
+TERMUX_PKG_VERSION=0.17.3
+TERMUX_PKG_SHA256=e843904417adf926613431e4403fded24fade56269446e92aac6ff1db86af81e
 TERMUX_PKG_SRCURL=https://github.com/junegunn/fzf/archive/${TERMUX_PKG_VERSION}.tar.gz
-TERMUX_PKG_FOLDERNAME=fzf-${TERMUX_PKG_VERSION}
 TERMUX_PKG_BUILD_IN_SRC="yes"
-TERMUX_PKG_DEPENDS="bash, ncurses"
+# Depend on findutils as fzf uses the -fstype option, which busybox
+# find does not support, when invoking find:
+TERMUX_PKG_DEPENDS="bash, findutils"
 
-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_step_make() {
+	:
+}
 
+termux_step_make_install () {
 	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"
 
-	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
+	# See the fzf Makefile:
+	local _BINARY="target/fzf-${GOOS}_"
+	if [ $TERMUX_ARCH = "arm" ]; then
+		_BINARY+="arm7"
+	elif [ $TERMUX_ARCH = "i686" ]; then
+		_BINARY+="386"
+	elif [ $TERMUX_ARCH = "x86_64" ]; then
+		_BINARY+="amd64"
+	elif [ $TERMUX_ARCH = "aarch64" ]; then
+		_BINARY+="arm8"
+	else
+		termux_error_exit "Unsupported arch: $TERMUX_ARCH"
+	fi
+
+	LDFLAGS="-pie" make $_BINARY
+	cp $_BINARY $TERMUX_PREFIX/bin/fzf
 
 	# Install fzf-tmux, a bash script for launching fzf in a tmux pane:
 	cp $TERMUX_PKG_SRCDIR/bin/fzf-tmux $TERMUX_PREFIX/bin
@@ -36,10 +42,19 @@ 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
+	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
 	cp $TERMUX_PKG_SRCDIR/plugin/fzf.vim $TERMUX_PREFIX/share/nvim/runtime/plugin/
 }
+
+termux_step_post_massage () {
+	# Remove so that the vim build doesn't add it to vim-runtime:
+	rm $TERMUX_PREFIX/share/vim/vim80/plugin/fzf.vim
+}