summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHannu Nyman <hannu.nyman@iki.fi>2018-12-27 15:46:14 +0200
committerGitHub <noreply@github.com>2018-12-27 15:46:14 +0200
commit74a17bf87f3dd1acd5d70707bf6b0f6121b28d7b (patch)
tree6024dd307f414cf1c013a1c0c55f4739b31c18a1
parentf53f78e0b12c8c32cc4ff47cfa25092388d645e7 (diff)
parent94cdc5adc75df661ae384e2790ad645c796c7ef9 (diff)
Merge pull request #7770 from jqqqqqqqqqq/master
fish: fixed apropos not found
-rw-r--r--utils/fish/Makefile5
1 files changed, 4 insertions, 1 deletions
diff --git a/utils/fish/Makefile b/utils/fish/Makefile
index 672d71231..ec20094f7 100644
--- a/utils/fish/Makefile
+++ b/utils/fish/Makefile
@@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=fish
PKG_VERSION:=2.7.1
-PKG_RELEASE:=1
+PKG_RELEASE:=2
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://codeload.github.com/fish-shell/fish-shell/tar.gz/$(PKG_VERSION)?
@@ -58,10 +58,13 @@ grep fish $${IPKG_INSTROOT}/etc/shells || \
if [[ -e /bin/fish ]] && ([[ ! -L /bin/fish ]] || [[ "$(readlink -fn $${IPKG_INSTROOT}/bin/fish)" != "../$(CONFIGURE_PREFIX)/bin/fish" ]]); then
ln -fs "../$(CONFIGURE_PREFIX)/bin/fish" "$${IPKG_INSTROOT}/bin/fish"
fi
+ echo '#!/bin/sh' > /usr/bin/apropos
+ chmod +x /usr/bin/apropos
endef
define Package/fish/postrm
rm -rf "$${IPKG_INSTROOT}/$(CONFIGURE_PREFIX)/share/fish/$(PKG_VERSION)"
+ rm -f /usr/bin/apropos
endef
$(eval $(call BuildPackage,fish))