From 1cf40f4ee766a5a55cdd2c155370c1f6d23aa764 Mon Sep 17 00:00:00 2001
From: mack-a <57424792+mack-a@users.noreply.github.com>
Date: Fri, 1 Jan 2021 21:59:59 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E8=84=9A=E6=9C=AC):=20=E4=BF=AE=E6=94=B9v2?=
 =?UTF-8?q?ray=E4=B8=8D=E9=80=82=E9=85=8D=E5=A4=9A=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E7=94=9F=E6=88=90uuid=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 install.sh | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/install.sh b/install.sh
index e6578c6..1222975 100644
--- a/install.sh
+++ b/install.sh
@@ -61,6 +61,8 @@ initVar(){
     # 核心安装path
     coreInstallPath=
 
+    # v2ctl Path
+    ctlPath=
     # 1.全部安装
     # 2.个性化安装
     v2rayAgentInstallType=
@@ -123,10 +125,12 @@ readInstallType(){
                     # 不带XTLS的v2ray-core
                     coreInstallType=2
                     coreInstallPath=/etc/v2ray-agent/v2ray/v2ray
+                    ctlPath=/etc/v2ray-agent/v2ray/v2ctl
                 elif [[ ! -z `cat /etc/v2ray-agent/v2ray/conf/02_VLESS_TCP_inbounds.json|grep xtls` ]]
                 then
                     # 带XTLS的v2ray-core
                     coreInstallPath=/etc/v2ray-agent/v2ray/v2ray
+                    ctlPath=/etc/v2ray-agent/v2ray/v2ctl
                     coreInstallType=3
                 fi
             fi
@@ -140,6 +144,7 @@ readInstallType(){
                 # xray-core
                 configPath=/etc/v2ray-agent/xray/conf/
                 coreInstallPath=/etc/v2ray-agent/xray/xray
+                ctlPath=/etc/v2ray-agent/xray/xray
                 coreInstallType=1
             fi
         fi
@@ -2603,6 +2608,7 @@ addUser(){
         customUUID
         customUserEmail
     fi
+
     while [[ ${userNum} -gt 0 ]]
     do
         let userNum--
@@ -2610,7 +2616,7 @@ addUser(){
         then
             uuid=${currentCustomUUID}
         else
-            uuid=`${coreInstallPath} uuid`
+            uuid=`${ctlPath} uuid`
         fi
 
         if [[ ! -z "${currentCustomEmail}" ]]