From 0309b4b94c6319824670d0974d7624976b54ac90 Mon Sep 17 00:00:00 2001 From: remittor Date: Fri, 16 Jan 2026 20:08:21 +0300 Subject: [PATCH] updater: Add uninstall oldest mdig and ip2net packages --- zapret2/update-pkg.sh | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/zapret2/update-pkg.sh b/zapret2/update-pkg.sh index 5eb1ae6..45e107b 100755 --- a/zapret2/update-pkg.sh +++ b/zapret2/update-pkg.sh @@ -75,9 +75,13 @@ ZAP_PKG_URL= if command -v apk >/dev/null; then PKG_MGR=apk ZAP_PKG_EXT=apk + PKG_CHECK="apk info -e " + PKG_REMOVE="apk del --force " elif command -v opkg >/dev/null; then PKG_MGR=opkg ZAP_PKG_EXT=ipk + PKG_CHECK="opkg status " + PKG_REMOVE="opkg remove --force-remove " else echo "ERROR: No package manager found" return 1 @@ -487,7 +491,7 @@ if [ "$opt_update" != "" ]; then fi fi if ! command -v unzip >/dev/null 2>&1; then - echo "ERROR: package \"upzip\" not installed!" + echo "ERROR: package \"unzip\" not installed!" return 218 fi unzip -q "$ZAP_PKG_FN" -d $ZAP_PKG_DIR @@ -525,6 +529,14 @@ if [ "$opt_update" != "" ]; then if [ "$opt_forced" = true ]; then pkg_mgr_update fi + if ${PKG_CHECK} ${ZAPRET_CFG_NAME}-mdig >/dev/null 2>&1; then + echo "Uninstall mdig..." + ${PKG_REMOVE} ${ZAPRET_CFG_NAME}-mdig + fi + if ${PKG_CHECK} ${ZAPRET_CFG_NAME}-ip2net >/dev/null 2>&1; then + echo "Uninstall ip2net..." + ${PKG_REMOVE} ${ZAPRET_CFG_NAME}-ip2net + fi echo "Install downloaded packages..." if [ "$PKG_MGR" != "apk" ]; then opkg install --force-reinstall "$ZAP_PKG_BASE_FN"