X-Git-Url: https://git.distorted.org.uk/~mdw/termux-packages/blobdiff_plain/dab936e5018e00cd31724983532a5df1146a7840..eaf334031529907c8b72b0c4731ab9b3145885fc:/packages/fish/build.sh

diff --git a/packages/fish/build.sh b/packages/fish/build.sh
index 9aa9c8be..3aac8f63 100644
--- a/packages/fish/build.sh
+++ b/packages/fish/build.sh
@@ -1,20 +1,21 @@
 TERMUX_PKG_HOMEPAGE=http://fishshell.com/
 TERMUX_PKG_DESCRIPTION="Shell geared towards interactive use"
-TERMUX_PKG_VERSION=2.2.`date "+%Y%m%d%H%M"`
-# TERMUX_PKG_SRCURL=http://fishshell.com/files/${TERMUX_PKG_VERSION}/fish-${TERMUX_PKG_VERSION}.tar.gz
-TERMUX_PKG_SRCURL=https://github.com/fish-shell/fish-shell/archive/master.zip
-TERMUX_PKG_NO_SRC_CACHE=yes
-TERMUX_PKG_DEPENDS="ncurses, libgnustl, libandroid-support"
+TERMUX_PKG_VERSION=2.3.1
+TERMUX_PKG_BUILD_REVISION=1
+TERMUX_PKG_SRCURL=https://github.com/fish-shell/fish-shell/releases/download/$TERMUX_PKG_VERSION/fish-${TERMUX_PKG_VERSION}.tar.gz
+# fish calls 'tput' from ncurses-utils, at least when cancelling (Ctrl+C) a command line.
+# man is needed since fish calls apropos during command completion.
+TERMUX_PKG_DEPENDS="ncurses, libandroid-support, ncurses-utils, man"
 TERMUX_PKG_BUILD_IN_SRC=yes
-TERMUX_PKG_FOLDERNAME=fish-shell-master
+TERMUX_PKG_FOLDERNAME=fish-$TERMUX_PKG_VERSION
 
-termux_step_pre_configure () {
-	cd $TERMUX_PKG_SRCDIR
-	autoconf
+CXXFLAGS+=" $CPPFLAGS"
 
-	CXXFLAGS+=" $CPPFLAGS"
+termux_step_post_make_install () {
+	cat >> $TERMUX_PREFIX/etc/fish/config.fish <<HERE
 
-	LDFLAGS+=" -lgnustl_shared"
-
-	export PCRE2_CONFIG_EXTRAS="--host=$TERMUX_HOST_PLATFORM"
+function __fish_command_not_found_handler --on-event fish_command_not_found
+	$TERMUX_PREFIX/libexec/termux/command-not-found \$argv[1]
+end
+HERE
 }