From bd68f783744276bebc9cc6f1fc289c54b715211b Mon Sep 17 00:00:00 2001
From: Mattraks <16359027+Mattraks@users.noreply.github.com>
Date: Wed, 2 Dec 2020 16:54:08 +0800
Subject: [PATCH] Adjust compatibility with Xray (#5862)

---
 .../luci-app-v2ray-server/root/etc/init.d/v2ray_server   | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/package/lean/luci-app-v2ray-server/root/etc/init.d/v2ray_server b/package/lean/luci-app-v2ray-server/root/etc/init.d/v2ray_server
index 86a8e043a..7d82f132c 100755
--- a/package/lean/luci-app-v2ray-server/root/etc/init.d/v2ray_server
+++ b/package/lean/luci-app-v2ray-server/root/etc/init.d/v2ray_server
@@ -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
-}
\ No newline at end of file
+}