diff --git a/package/lienol/luci-app-passwall/Makefile b/package/lienol/luci-app-passwall/Makefile index bc1e492ce5..a324e0f8bd 100644 --- a/package/lienol/luci-app-passwall/Makefile +++ b/package/lienol/luci-app-passwall/Makefile @@ -86,7 +86,7 @@ define Package/$(PKG_NAME) TITLE:=LuCI support for PassWall PKGARCH:=all DEPENDS:=+libmbedtls +iptables-mod-tproxy +ip +ipset +coreutils +coreutils-base64 +coreutils-nohup +luci-lib-jsonc \ - +wget +resolveip +unzip +dnsmasq-full +tcping \ + +wget +resolveip +unzip +dnsmasq-full +tcping +libuci-lua \ +PACKAGE_$(PKG_NAME)_INCLUDE_ipt2socks:ipt2socks \ +PACKAGE_$(PKG_NAME)_INCLUDE_Shadowsocks:shadowsocks-libev-ss-redir \ +PACKAGE_$(PKG_NAME)_INCLUDE_ShadowsocksR:shadowsocksr-libev-alt \ diff --git a/package/lienol/luci-app-passwall/root/usr/share/passwall/iptables.sh b/package/lienol/luci-app-passwall/root/usr/share/passwall/iptables.sh index e7deea7371..598d33960a 100755 --- a/package/lienol/luci-app-passwall/root/usr/share/passwall/iptables.sh +++ b/package/lienol/luci-app-passwall/root/usr/share/passwall/iptables.sh @@ -101,7 +101,7 @@ gen_laniplist() { load_acl() { local count=$(uci show $CONFIG | grep "@acl_rule" | sed -n '$p' | cut -d '[' -f 2 | cut -d ']' -f 1) - [ -n "$count" -a "$count" -ge 0 ] && { + [ -n "$count" ] && [ "$count" -ge 0 ] && { u_get() { local ret=$(uci -q get $CONFIG.@acl_rule[$1].$2) echo ${ret:=$3}