From b43ca939d46c8abe4da5bb7dc2349c24e3fa91c2 Mon Sep 17 00:00:00 2001
From: mack-a <57424792+mack-a@users.noreply.github.com>
Date: Wed, 20 Jan 2021 16:56:20 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E8=84=9A=E6=9C=AC):=20=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E5=AE=89=E8=A3=85=E6=97=B6=E9=80=89=E6=8B=A9=E4=B8=8D=E4=BD=BF?=
 =?UTF-8?q?=E7=94=A8=E5=BD=93=E5=89=8D=E5=9F=9F=E5=90=8D=E8=80=8C=E5=87=BA?=
 =?UTF-8?q?=E7=8E=B0=E7=9A=84=E9=94=99=E8=AF=AF=E6=97=A5=E5=BF=97=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=E3=80=81=E5=A2=9E=E5=8A=A0splice=E3=80=81direct?=
 =?UTF-8?q?=E5=88=86=E5=89=B2=E7=BA=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 install.sh | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/install.sh b/install.sh
index 4034b30..ea5f12a 100644
--- a/install.sh
+++ b/install.sh
@@ -568,12 +568,6 @@ checkIP() {
 installTLS() {
 	echoContent skyBlue "\n进度  $1/${totalProgress} : 申请TLS证书\n"
 	local tlsDomain=${domain}
-	if [[ -n "${currentHost}" ]]; then
-		tlsDomain=${currentHost}
-	elif [[ -n "${domain}" ]]; then
-		tlsDomain=${domain}
-	fi
-
 	# 安装tls
 	if [[ -f "/etc/v2ray-agent/tls/${tlsDomain}.crt" && -f "/etc/v2ray-agent/tls/${tlsDomain}.key" ]] || [[ -d "$HOME/.acme.sh/${tlsDomain}_ecc" && -f "$HOME/.acme.sh/${tlsDomain}_ecc/${tlsDomain}.key" && -f "$HOME/.acme.sh/${tlsDomain}_ecc/${tlsDomain}.cer" ]]; then
 		# 存在证书
@@ -2007,6 +2001,8 @@ EOF
 			echoContent yellow " ---> 二维码 VLESS(VLESS+TCP+TLS/xtls-rprx-direct)"
 			echoContent green "https://api.qrserver.com/v1/create-qr-code/?size=400x400&data=vless%3A%2F%2F${VLESSID}%40${host}%3A${port}%3F${encryption}%3Dnone%26security%3Dxtls%26type%3Dtcp%26${host}%3D${host}%26headerType%3Dnone%26flow%3Dxtls-rprx-direct%23${VLESSEmail}\n"
 
+			echoContent skyBlue "----------------------------------------------------------------------------------"
+
 			echoContent yellow " ---> 通用格式(VLESS+TCP+TLS/xtls-rprx-splice)"
 			echoContent green "    vless://${VLESSID}@${host}:${port}?encryption=none&security=xtls&type=tcp&host=${host}&headerType=none&flow=xtls-rprx-splice#${VLESSEmail}\n"
 
@@ -2127,8 +2123,7 @@ showAccounts() {
 	if [[ -n "${configPath}" ]]; then
 		show=1
 		if echo "${currentInstallProtocolType}" | grep -q 0 || [[ -z "${currentInstallProtocolType}" ]]; then
-			echoContent skyBlue "\n===================== VLESS TCP TLS/XTLS-direct/XTLS-splice ======================\n"
-
+			echoContent skyBlue "===================== VLESS TCP TLS/XTLS-direct/XTLS-splice ======================\n"
 			# cat ${configPath}02_VLESS_TCP_inbounds.json | jq .inbounds[0].settings.clients | jq -c '.[]'
 			jq .inbounds[0].settings.clients ${configPath}02_VLESS_TCP_inbounds.json | jq -c '.[]' | while read -r user; do
 				defaultBase64Code vlesstcp $(echo "${user}" | jq .email) $(echo "${user}" | jq .id) "${currentHost}:${currentPort}" ${currentHost}
@@ -3089,7 +3084,7 @@ menu() {
 	cd "$HOME" || exit
 	echoContent red "\n=============================================================="
 	echoContent green "作者：mack-a"
-	echoContent green "当前版本：v2.3.3"
+	echoContent green "当前版本：v2.3.4"
 	echoContent green "Github：https://github.com/mack-a/v2ray-agent"
 	echoContent green "描述：七合一共存脚本"
 	echoContent red "=============================================================="