diff --git a/package/lienol/luci-app-passwall/Makefile b/package/lienol/luci-app-passwall/Makefile index d7b736ea08..2d55f60dec 100644 --- a/package/lienol/luci-app-passwall/Makefile +++ b/package/lienol/luci-app-passwall/Makefile @@ -7,8 +7,8 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luci-app-passwall PKG_VERSION:=3.6 -PKG_RELEASE:=31 -PKG_DATE:=20200325 +PKG_RELEASE:=32 +PKG_DATE:=20200326 PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) diff --git a/package/lienol/luci-app-passwall/root/usr/share/passwall/app.sh b/package/lienol/luci-app-passwall/root/usr/share/passwall/app.sh index 75524e25a3..ebdf74c676 100755 --- a/package/lienol/luci-app-passwall/root/usr/share/passwall/app.sh +++ b/package/lienol/luci-app-passwall/root/usr/share/passwall/app.sh @@ -435,8 +435,10 @@ gen_start_config() { local plugin=$(config_n_get $node ss_plugin) if [ "$plugin" != "none" ]; then [ "$plugin" == "v2ray-plugin" -o "$plugin" == "obfs-local" ] && { + local plugin_opts="" local opts=$(config_n_get $node ss_plugin_opts) - plugin_params="--plugin $plugin --plugin-opts $opts" + [ -n "$opts" ] && plugin_opts="--plugin-opts $opts" + plugin_params="--plugin $plugin $plugin_opts" } fi for k in $(seq 1 $process); do diff --git a/package/lienol/luci-app-passwall/root/usr/share/passwall/subscribe.lua b/package/lienol/luci-app-passwall/root/usr/share/passwall/subscribe.lua index a41694aa29..360a5db7b2 100644 --- a/package/lienol/luci-app-passwall/root/usr/share/passwall/subscribe.lua +++ b/package/lienol/luci-app-passwall/root/usr/share/passwall/subscribe.lua @@ -85,11 +85,13 @@ end -- 判断是否过滤节点关键字 local filter_keyword_table = ucic2:get(application, "@global_subscribe[0]", "filter_keyword") local function is_filter_keyword(value) - for k,v in ipairs(filter_keyword_table) do - if value:find(v) then - return true - end - end + if filter_keyword_table then + for k,v in ipairs(filter_keyword_table) do + if value:find(v) then + return true + end + end + end return false end