Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

zsh: fix invalid postrm script and little refactor of scripts

Browse source 
The postrm script was missing shebang. Postrm scripts are packaged and
executed directly and not sourced by default script (as in case of prerm
and postinst).

Also move some indents around to not confuse reader. The section in
postinst was indented to same level as grep "condition" but is on same
level as initial grep (not part of that "condition").

Signed-off-by: Karel Kočí <karel.koci@nic.cz>
(cherry picked from commit d2d193d818)
This commit is contained in:
Karel Kočí 2019-12-18 09:57:23 +01:00 committed by Josef Schlehofer
parent 5a9b5ee78c
commit ea3e54accd
No known key found for this signature in database
GPG key ID: B950216FE4329F4C
1 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
utils/zsh/Makefile
View file

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=zsh PKG_NAME:=zsh
PKG_VERSION:=5.6.2 PKG_VERSION:=5.6.2
PKG_RELEASE:=2 PKG_RELEASE:=3
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=@SF/zsh PKG_SOURCE_URL:=@SF/zsh
@ -91,10 +91,10 @@ define Package/zsh/postinst
grep zsh $${IPKG_INSTROOT}/etc/shells || \ grep zsh $${IPKG_INSTROOT}/etc/shells || \
echo "/usr/bin/zsh" >> $${IPKG_INSTROOT}/etc/shells echo "/usr/bin/zsh" >> $${IPKG_INSTROOT}/etc/shells
# Backwards compatibility # Backwards compatibility
if [[ -e /bin/zsh ]] && ([[ ! -L /bin/zsh ]] || [[ "$(readlink -fn $${IPKG_INSTROOT}/bin/zsh)" != "../$(CONFIGURE_PREFIX)/bin/zsh" ]]); then if [[ -e /bin/zsh ]] && ([[ ! -L /bin/zsh ]] || [[ "$(readlink -fn $${IPKG_INSTROOT}/bin/zsh)" != "../$(CONFIGURE_PREFIX)/bin/zsh" ]]); then
ln -fs "../$(CONFIGURE_PREFIX)/bin/zsh" "$${IPKG_INSTROOT}/bin/zsh" ln -fs "../$(CONFIGURE_PREFIX)/bin/zsh" "$${IPKG_INSTROOT}/bin/zsh"
fi fi
endef endef
define Package/zsh/install define Package/zsh/install
@ -107,7 +107,8 @@ define Package/zsh/install
endef endef
define Package/zsh/postrm define Package/zsh/postrm
rm -rf "$${IPKG_INSTROOT}/$(CONFIGURE_PREFIX)/share/zsh/$(PKG_VERSION)" #!/bin/sh
rm -rf "$${IPKG_INSTROOT}/$(CONFIGURE_PREFIX)/share/zsh/$(PKG_VERSION)"
endef endef
$(eval $(call BuildPackage,zsh)) $(eval $(call BuildPackage,zsh))