From c9b8a0c7c934cce2374ce62aee5083b3d983a01e Mon Sep 17 00:00:00 2001 From: Mattraks <16359027+Mattraks@users.noreply.github.com> Date: Thu, 18 Feb 2021 10:41:11 +0800 Subject: [PATCH] luci-app-ssr-plus: bug fixes Signed-off-by: CN_SZTL --- package/lean/luci-app-ssr-plus/root/etc/init.d/shadowsocksr | 3 +-- .../root/usr/share/shadowsocksr/subscribe.lua | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/package/lean/luci-app-ssr-plus/root/etc/init.d/shadowsocksr b/package/lean/luci-app-ssr-plus/root/etc/init.d/shadowsocksr index 4100a3593a..1a7310fb70 100755 --- a/package/lean/luci-app-ssr-plus/root/etc/init.d/shadowsocksr +++ b/package/lean/luci-app-ssr-plus/root/etc/init.d/shadowsocksr @@ -139,8 +139,7 @@ _exit() { } first_type() { - local ret=$(which "/bin/${path_name}" "${TMP_BIN_PATH}/${path_name}" "${path_name}" "$@" | head -n1) - echo ${ret:=$@} + type -t -p "/bin/${1}" -p "${TMP_BIN_PATH}/${1}" -p "${1}" "$@" | head -n1 } ln_start_bin() { diff --git a/package/lean/luci-app-ssr-plus/root/usr/share/shadowsocksr/subscribe.lua b/package/lean/luci-app-ssr-plus/root/usr/share/shadowsocksr/subscribe.lua index 741f0aa145..cf6f6f8da6 100755 --- a/package/lean/luci-app-ssr-plus/root/usr/share/shadowsocksr/subscribe.lua +++ b/package/lean/luci-app-ssr-plus/root/usr/share/shadowsocksr/subscribe.lua @@ -232,7 +232,7 @@ local function processData(szType, content) local userinfo = hostInfo[1] local password = userinfo result.alias = UrlDecode(alias) - result.type = "trojan" + result.type = luci.sys.exec('type -t -p trojan') ~= "" and "trojan" or "v2ray" result.v2ray_protocol = "trojan" result.server = host[1] -- 按照官方的建议 默认验证ssl证书