diff --git a/utils/fish/Makefile b/utils/fish/Makefile index 4c4e10898a..ba9f051f66 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))