luci-app-v2ray-server: add compatibility with Xray

Co-authored-by: caicaicai21 <caicaicai21@outlook.com>
This commit is contained in:
Mattraks 2020-12-02 16:54:08 +08:00 committed by CN_SZTL
parent 29b970b6f1
commit fddb83c35e
No known key found for this signature in database
GPG Key ID: 6850B6345C862176

View File

@ -20,7 +20,12 @@ gen_v2ray_config_file() {
config_get transport $1 transport
lua /usr/lib/lua/luci/model/cbi/v2ray_server/api/genv2rayconfig.lua $1 > $CONFIG_PATH/$1.json
echolog "$remarks $port 生成并运行 V2ray 配置文件 - $CONFIG_PATH/$1.json"
[ -f /var/v2server ] || cp -a /usr/bin/v2ray/v2ray /var/v2server
if [ ! -f /var/v2server ]; then
local ret="/usr/bin/xray"
[ ! -f "$ret" ] && ret="/usr/bin/v2ray/v2ray"
[ ! -f "$ret" ] && ret="/usr/bin/v2ray"
cp -a $ret /var/v2server
fi
/var/v2server -config $CONFIG_PATH/$1.json >/dev/null 2>&1 &
}
@ -56,4 +61,4 @@ restart() {
stop
sleep 1
start
}
}