Backups/immortalwrt-mt798x
1
0
Fork 0
mirror of https://github.com/hanwckf/immortalwrt-mt798x.git synced 2025-01-10 03:09:08 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

luci-app-passwall: sync with upstream source

Browse Source
This commit is contained in:
CN_SZTL 2020-03-26 12:51:29 +08:00
parent 778e87e31d
commit 863b16c609
No known key found for this signature in database
GPG Key ID: 6850B6345C862176
3 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
package/lienol/luci-app-passwall/Makefile
View File

@ -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)

4
package/lienol/luci-app-passwall/root/usr/share/passwall/app.sh
View File

@ -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

12
package/lienol/luci-app-passwall/root/usr/share/passwall/subscribe.lua
View File

@ -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