From 1dc5312231d096238d69e74aa4ef8e6df2129d35 Mon Sep 17 00:00:00 2001
From: mack-a <57424792+mack-a@users.noreply.github.com>
Date: Thu, 26 Nov 2020 17:38:34 +0800
Subject: [PATCH] =?UTF-8?q?feat(=E8=84=9A=E6=9C=AC):=20=E4=BF=AE=E6=94=B9x?=
 =?UTF-8?q?ray-core-->Xray-core=E3=80=81=E5=88=A0=E9=99=A4=E6=97=A5?=
 =?UTF-8?q?=E5=BF=97=E6=89=93=E5=8D=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 install.sh | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/install.sh b/install.sh
index 554175a..a932e83 100644
--- a/install.sh
+++ b/install.sh
@@ -103,7 +103,6 @@ readInstallType(){
     xrayCoreConfigFilePath=
     v2rayCoreConfigFilePath=
 
-    echo 进入readInstallType
     # 1.检测安装目录
     if [[ -d "/etc/v2ray-agent"  ]]
     then
@@ -267,16 +266,10 @@ cleanUp(){
 }
 
 initVar
-echo initVar
 checkSystem
-echo checkSystem
 readInstallType
-echo readInstallType
 readCustomInstallType
-echo readCustomInstallType
 readConfigHostPathUUID
-echo readConfigHostPathUUID
-
 
 
 # -------------------------------------------------------------
@@ -1159,10 +1152,10 @@ installXrayService(){
     then
         rm -rf /etc/systemd/system/xray.service
         touch /etc/systemd/system/xray.service
-        execStart='/etc/v2ray-agent/xray/xray -config /etc/v2ray-agent/xray/config_full.json'
+        execStart='/etc/v2ray-agent/xray/xray run -config /etc/v2ray-agent/xray/config_full.json'
         if [[ ! -z ${customInstallType} ]]
         then
-            execStart='/etc/v2ray-agent/xray/xray -confdir /etc/v2ray-agent/xray/conf'
+            execStart='/etc/v2ray-agent/xray/xray run -confdir /etc/v2ray-agent/xray/conf'
         fi
     cat << EOF > /etc/systemd/system/xray.service
 [Unit]
@@ -3185,7 +3178,7 @@ customInstall(){
 selectCoreInstall(){
     echoContent skyBlue "\n功能 1/${totalProgress} : 选择核心安装"
     echoContent red "\n=============================================================="
-    echoContent yellow "1.xray-core"
+    echoContent yellow "1.Xray-core"
     echoContent yellow "2.v2ray-core"
     echoContent yellow "3.v2ray-core[XTLS]"
     echoContent red "=============================================================="