0.46.070

Author: vernesong

luci-app-openclash/Makefile

@@ -1,7 +1,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=luci-app-openclash
-PKG_VERSION:=0.46.069
+PKG_VERSION:=0.46.070
 PKG_MAINTAINER:=vernesong <https://github.com/vernesong/OpenClash>
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)

luci-app-openclash/po/zh-cn/openclash.zh-cn.po

@@ -1608,8 +1608,11 @@ msgstr "开始下载"
 msgid "Download Successful, Start Pre Update Test..."
 msgstr "下载成功，开始进行更新前测试..."
 
-msgid "Pre Update Test Failed, The File is Saved in /tmp/openclash.ipk, Please Try to Update Manually!"
-msgstr "更新前测试失败，文件保存在 /tmp/openclash.ipk，请尝试手动更新！"
+msgid "Pre Update Test Failed, The File is Saved in /tmp/openclash.apk, Please Try to Update Manually With"
+msgstr "更新前测试失败，文件保存在 /tmp/openclash.apk，请尝试以下命令手动更新"
+
+msgid "Pre Update Test Failed, The File is Saved in /tmp/openclash.ipk, Please Try to Update Manually With"
+msgstr "更新前测试失败，文件保存在 /tmp/openclash.ipk，请尝试以下命令手动更新"
 
 msgid "Pre Update Test Passed, Ready to Update and Please Do not Refresh The Page and Other Operations..."
 msgstr "更新前测试通过，准备开始更新，更新过程请不要刷新页面和进行其他操作..."

luci-app-openclash/root/etc/init.d/openclash

@@ -2971,7 +2971,7 @@ get_config()
    enable_respect_rules=$(uci -q get openclash.config.enable_respect_rules || echo 0)
    intranet_allowed_wan_name=$(uci -q get openclash.config.intranet_allowed_wan_name || echo 0)
    custom_fakeip_filter_mode=$(uci -q get openclash.config.custom_fakeip_filter_mode || echo "blacklist")
-   iptables_compat=$(iptables -m owner -h 2>/dev/null | grep "owner match options" || echo 0)
+   iptables_compat=$(iptables -m owner -h 2>/dev/null | grep "owner match options" || command -v fw4 || echo 0)
    [ -z "$dns_port" ] && dns_port=7874 && uci -q set openclash.config.dns_port=7874
    uci -q commit openclash
 }

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

@@ -141,7 +141,7 @@ dnsmasq-full(ipset): $(ts_re "$(dnsmasq --version |grep -v no-ipset |grep ipset)
 dnsmasq-full(nftset): $(ts_re "$(dnsmasq --version |grep nftset)")
 bash: $(ts_re "$(ipk_v "bash")")
 curl: $(ts_re "$(ipk_v "curl")")
-ca-certificates: $(ts_re "$(ipk_v "ca-certificates")")
+ca-bundle: $(ts_re "$(ipk_v "ca-bundle")")
 ipset: $(ts_re "$(ipk_v "ipset")")
 ip-full: $(ts_re "$(ipk_v "ip-full")")
 ruby: $(ts_re "$(ipk_v "ruby")")

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

@@ -90,7 +90,7 @@ if [ -n "$OP_CV" ] && [ -n "$OP_LV" ] && [ "$(expr "$OP_LV" \> "$OP_CV")" -eq 1
       if [ -x "/bin/opkg" ]; then
          if [ -s "/tmp/openclash.ipk" ]; then
             if [ -z "$(opkg install /tmp/openclash.ipk --noaction 2>/dev/null |grep 'Upgrading luci-app-openclash on root' 2>/dev/null)" ]; then
-               LOG_OUT "【OpenClash - v$LAST_VER】Pre Update Test Failed, The File is Saved in /tmp/openclash.ipk, Please Try to Update Manually!"
+               LOG_OUT "【OpenClash - v$LAST_VER】Pre Update Test Failed, The File is Saved in /tmp/openclash.ipk, Please Try to Update Manually With【opkg install /tmp/openclash.ipk】"
                if [ "$(uci -q get openclash.config.restart)" -eq 1 ]; then
                   uci -q set openclash.config.restart=0
                   uci -q commit openclash
@@ -106,7 +106,7 @@ if [ -n "$OP_CV" ] && [ -n "$OP_LV" ] && [ "$(expr "$OP_LV" \> "$OP_CV")" -eq 1
          if [ -s "/tmp/openclash.apk" ]; then
             apk add -s -q --clean-protected --allow-untrusted /tmp/openclash.apk >/dev/null 2>&1
             if [ "$?" != "0" ]; then
-               LOG_OUT "【OpenClash - v$LAST_VER】Pre Update Test Failed, The File is Saved in /tmp/openclash.apk, Please Try to Update Manually!"
+               LOG_OUT "【OpenClash - v$LAST_VER】Pre Update Test Failed, The File is Saved in /tmp/openclash.apk, Please Try to Update Manually With【apk add -q --clean-protected --allow-untrusted /tmp/openclash.apk】"
                if [ "$(uci -q get openclash.config.restart)" -eq 1 ]; then
                   uci -q set openclash.config.restart=0
                   uci -q commit openclash