mirror of
https://github.com/novatiq/packages.git
synced 2026-04-30 07:28:39 +01:00
Merge pull request #2729 from cshore/pull-request-wget-fix-symlink-issue
net/wget: Remove use broken use of postrm/postinst symlinks
This commit is contained in:
+3
-37
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
|
||||
|
||||
PKG_NAME:=wget
|
||||
PKG_VERSION:=1.18
|
||||
PKG_RELEASE:=1
|
||||
PKG_RELEASE:=2
|
||||
|
||||
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
|
||||
PKG_SOURCE_URL:=@GNU/$(PKG_NAME)
|
||||
@@ -86,47 +86,13 @@ endif
|
||||
define Package/wget/install
|
||||
$(INSTALL_DIR) $(1)/usr/bin
|
||||
$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/wget $(1)/usr/bin/wget-ssl
|
||||
ln -sf wget-ssl $(1)/usr/bin/wget
|
||||
endef
|
||||
|
||||
define Package/wget-nossl/install
|
||||
$(INSTALL_DIR) $(1)/usr/bin
|
||||
$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/wget $(1)/usr/bin/wget-nossl
|
||||
endef
|
||||
|
||||
define Package/wget/postinst
|
||||
#!/bin/sh
|
||||
if [ -e $${IPKG_INSTROOT}/usr/bin/wget ]; then
|
||||
rm -rf $${IPKG_INSTROOT}/usr/bin/wget;
|
||||
fi
|
||||
ln -sf ./wget-ssl $${IPKG_INSTROOT}/usr/bin/wget
|
||||
endef
|
||||
|
||||
define Package/wget/postrm
|
||||
#!/bin/sh
|
||||
rm $${IPKG_INSTROOT}/usr/bin/wget
|
||||
[ -x $${IPKG_INSTROOT}/usr/bin/wget-nossl ] && ln -s ./wget-nossl $${IPKG_INSTROOT}/usr/bin/wget || {
|
||||
ln -s ../../bin/busybox $${IPKG_INSTROOT}/usr/bin/wget
|
||||
$${IPKG_INSTROOT}/usr/bin/wget 2>&1 | grep 'applet not found' > /dev/null 2>&1 && rm $${IPKG_INSTROOT}/usr/bin/wget
|
||||
}
|
||||
exit 0
|
||||
endef
|
||||
|
||||
define Package/wget-nossl/postinst
|
||||
#!/bin/sh
|
||||
if [ -e $${IPKG_INSTROOT}/usr/bin/wget ]; then
|
||||
rm -rf $${IPKG_INSTROOT}/usr/bin/wget;
|
||||
fi
|
||||
ln -s ./wget-nossl $${IPKG_INSTROOT}/usr/bin/wget
|
||||
endef
|
||||
|
||||
define Package/wget-nossl/postrm
|
||||
#!/bin/sh
|
||||
rm $${IPKG_INSTROOT}/usr/bin/wget
|
||||
[ -x $${IPKG_INSTROOT}/usr/bin/wget-ssl ] && ln -s ./wget-ssl $${IPKG_INSTROOT}/usr/bin/wget || {
|
||||
ln -s ../../bin/busybox $${IPKG_INSTROOT}/usr/bin/wget
|
||||
$${IPKG_INSTROOT}/usr/bin/wget 2>&1 | grep 'applet not found' > /dev/null 2>&1 && rm $${IPKG_INSTROOT}/usr/bin/wget
|
||||
}
|
||||
exit 0
|
||||
ln -sf wget-nossl $(1)/usr/bin/wget
|
||||
endef
|
||||
|
||||
$(eval $(call BuildPackage,wget))
|
||||
|
||||
Reference in New Issue
Block a user