fix: can not recover packages when apk upgrade

Author: vernesong

luci-app-openclash/Makefile

@@ -152,7 +152,8 @@ define Package/$(PKG_NAME)/postrm
 	uci -q delete ucitrack.@openclash[-1]
 	uci -q commit ucitrack
 	}
-	rm -rf /tmp/luci-*
+	rm -rf /tmp/luci-indexcache /tmp/luci-indexcache.* /var/luci-indexcache /var/luci-indexcache.* >/dev/null 2>&1
+	rm -rf /tmp/luci-modulecache /var/luci-modulecache >/dev/null 2>&1
 	exit 0
 endef
 

luci-app-openclash/root/etc/uci-defaults/luci-openclash

@@ -258,6 +258,6 @@ sed -i '/.*kB maximum content size*/c\export let HTTP_MAX_CONTENT = 1024*10240;
 
 /etc/init.d/uhttpd restart >/dev/null 2>&1
 
-rm -f /tmp/luci-indexcache >/dev/null 2>&1
-rm -f /tmp/luci-indexcache.* >/dev/null 2>&1
+rm -rf /tmp/luci-indexcache /tmp/luci-indexcache.* /var/luci-indexcache /var/luci-indexcache.* >/dev/null 2>&1
+rm -rf /tmp/luci-modulecache /var/luci-modulecache >/dev/null 2>&1
 exit 0

luci-app-openclash/root/usr/share/openclash/openclash_update.sh

@@ -56,7 +56,7 @@ LAST_VER=$(sed -n 1p "$LAST_OPVER" 2>/dev/null |sed "s/^v//g" |tr -d "\n")
 if [ -x "/bin/opkg" ]; then
    OP_CV=$(rm -f /var/lock/opkg.lock && opkg status luci-app-openclash 2>/dev/null |grep 'Version' |awk -F 'Version: ' '{print $2}' 2>/dev/null)
 elif [ -x "/usr/bin/apk" ]; then
-   OP_CV=$(apk list luci-app-openclash 2>/dev/null|grep 'installed' | grep -oE '[0-9]+(\.[0-9]+)*' | head -1 2>/dev/null)
+   OP_CV=$(apk list luci-app-openclash 2>/dev/null|grep "installed" | grep -oE '[0-9]+(\.[0-9]+)*' | head -1 2>/dev/null)
 fi
 OP_LV=$(sed -n 1p "$LAST_OPVER" 2>/dev/null |sed "s/^v//g" |tr -d "\n")
 RELEASE_BRANCH=$(uci_get_config "release_branch" || echo "master")
@@ -227,7 +227,7 @@ check_install_success()
    if [ -x "/bin/opkg" ]; then
       current_version=$(rm -f /var/lock/opkg.lock && opkg status luci-app-openclash 2>/dev/null |grep 'Version' |awk -F 'Version: ' '{print $2}' 2>/dev/null)
    elif [ -x "/usr/bin/apk" ]; then
-      current_version=$(apk list luci-app-openclash 2>/dev/null|grep 'installed' | grep -oE '[0-9]+(\.[0-9]+)*' | head -1 2>/dev/null)
+      current_version=$(apk list luci-app-openclash 2>/dev/null |grep "installed" | grep -oE '[0-9]+(\.[0-9]+)*' | head -1 2>/dev/null)
    fi
 
    if [ -n "$current_version" ] && [ "$current_version" = "$target_version" ]; then
@@ -260,7 +260,7 @@ install_missing_packages() {
       done
    elif [ -x "/usr/bin/apk" ]; then
       for pkg in $installed_before; do
-         if ! apk info "$pkg" >/dev/null 2>&1; then
+         if ! apk list "$pkg" |grep "installed" >/dev/null 2>&1; then
             local retry_count=0
             local max_retries=3
             while [ $retry_count -lt $max_retries ]; do
@@ -298,7 +298,7 @@ while [ $install_retry_count -lt $max_install_retries ]; do
       opkg install /tmp/openclash.ipk
    elif [ -x "/usr/bin/apk" ]; then
       for pkg in $packages_to_check; do
-         if apk info "$pkg" >/dev/null 2>&1; then
+         if apk list "$pkg" |grep "installed" >/dev/null 2>&1; then
             installed_before="$installed_before $pkg"
          fi
       done