zhao/openwrt_helloworld
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

luci: optimise depends check

Browse Source
This commit is contained in:
ShanStone 2023-07-18 15:01:22 +08:00 committed by sbwml
parent 9add37cbfe
commit 89cf6d1721
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
luci-app-passwall/root/usr/share/passwall/app.sh
View File

@ -205,17 +205,15 @@ check_port_exists() {
check_depends() {
local tables=${1}
local status=0
if [ "$tables" == "iptables" ]; then
for depends in "iptables-mod-tproxy" "iptables-mod-socket" "iptables-mod-iprange" "iptables-mod-conntrack-extra" "kmod-ipt-nat"; do
[ -z "$(opkg status ${depends} 2>/dev/null | grep 'Status' | awk -F ': ' '{print $2}' 2>/dev/null)" ] && echolog "$tables透明代理基础依赖 $depends 未安装..." && status=1
[ -z "$(opkg status ${depends} 2>/dev/null | grep 'Status' | awk -F ': ' '{print $2}' 2>/dev/null)" ] && echolog "$tables透明代理基础依赖 $depends 未安装..."
done
else
for depends in "kmod-nft-socket" "kmod-nft-tproxy" "kmod-nft-nat"; do
[ -z "$(opkg status ${depends} 2>/dev/null | grep 'Status' | awk -F ': ' '{print $2}' 2>/dev/null)" ] && echolog "$tables透明代理基础依赖 $depends 未安装..." && status=1
[ -z "$(opkg status ${depends} 2>/dev/null | grep 'Status' | awk -F ': ' '{print $2}' 2>/dev/null)" ] && echolog "$tables透明代理基础依赖 $depends 未安装..."
done
fi
echo $status
}
get_new_port() {
@ -1586,7 +1584,7 @@ start() {
fi
fi
[ "$(check_depends $USE_TABLES)" == "0" ] || unset USE_TABLES
check_depends $USE_TABLES
[ "$ENABLED_DEFAULT_ACL" == 1 ] && {
start_redir TCP