From 8fda0fa34bb5684604a6f65ef93fd06cae95eac4 Mon Sep 17 00:00:00 2001 From: jerrykuku Date: Sat, 27 Feb 2021 13:52:40 +0800 Subject: [PATCH] luci-app-vssr: bump to latest git HEAD Signed-off-by: Tianling Shen --- package/ctcgfw/luci-app-vssr/Makefile | 2 +- package/ctcgfw/luci-app-vssr/root/usr/share/lua/vssrutil.lua | 3 ++- .../luci-app-vssr/root/usr/share/vssr/genconfig_v2ray_s.lua | 3 +-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/ctcgfw/luci-app-vssr/Makefile b/package/ctcgfw/luci-app-vssr/Makefile index a0b9f3fd9d..45198d1b01 100644 --- a/package/ctcgfw/luci-app-vssr/Makefile +++ b/package/ctcgfw/luci-app-vssr/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luci-app-vssr PKG_VERSION:=1.22 -PKG_RELEASE:=20210119 +PKG_RELEASE:=20210227 PKG_CONFIG_DEPENDS:= \ CONFIG_PACKAGE_$(PKG_NAME)_INCLUDE_Kcptun \ diff --git a/package/ctcgfw/luci-app-vssr/root/usr/share/lua/vssrutil.lua b/package/ctcgfw/luci-app-vssr/root/usr/share/lua/vssrutil.lua index 03f3788bf7..064eea7420 100644 --- a/package/ctcgfw/luci-app-vssr/root/usr/share/lua/vssrutil.lua +++ b/package/ctcgfw/luci-app-vssr/root/usr/share/lua/vssrutil.lua @@ -89,8 +89,9 @@ function _M.get_flag(remark, host) local iso_code = nil if (remark ~= nil) then + remark = string.gsub(remark, "NETWORKS", "") for i, v in pairs(emoji_table) do - if (string.find(string.lower(remark), string.lower(v))) then + if (string.find(string.lower(remark), string.lower(v)) ~= nil) then iso_code = string.lower(iso_table[i]) break end diff --git a/package/ctcgfw/luci-app-vssr/root/usr/share/vssr/genconfig_v2ray_s.lua b/package/ctcgfw/luci-app-vssr/root/usr/share/vssr/genconfig_v2ray_s.lua index beed53de26..08f1dc0b6e 100755 --- a/package/ctcgfw/luci-app-vssr/root/usr/share/vssr/genconfig_v2ray_s.lua +++ b/package/ctcgfw/luci-app-vssr/root/usr/share/vssr/genconfig_v2ray_s.lua @@ -1,7 +1,6 @@ local ucursor = require 'luci.model.uci'.cursor() local name = 'vssr' local json = require 'luci.jsonc' -local proto = 'socks' local socks_switch = ucursor:get_first(name, 'socks5_proxy', 'enable_server') local auth_type = ucursor:get_first(name, 'socks5_proxy', 'enable_auth') local local_port = ucursor:get_first(name, 'socks5_proxy', 'local_port') @@ -15,7 +14,7 @@ local http_user = ucursor:get_first(name, 'http_proxy', 'http_user') local http_pass = ucursor:get_first(name, 'http_proxy', 'http_pass') function gen_inbound(sw, auth_type, local_port, user, pass, proto) - local bound = {} + local bound if sw == 0 then bound = nil else