From 0f66d3f473326cc44ef512652c96d1173c63cfc1 Mon Sep 17 00:00:00 2001
From: mack-a <57424792+mack-a@users.noreply.github.com>
Date: Thu, 27 Oct 2022 17:48:12 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E8=84=9A=E6=9C=AC):=20=E4=BF=AE=E6=94=B9dn?=
 =?UTF-8?q?s=E5=AE=89=E8=A3=85=E9=80=9A=E9=85=8D=E7=AC=A6=E8=AF=81?=
 =?UTF-8?q?=E4=B9=A6=E5=90=8E=E6=97=A0=E6=B3=95=E6=89=8B=E5=8A=A8=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0=E8=AF=81=E4=B9=A6=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 install.sh | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/install.sh b/install.sh
index 77d323d..fc55a29 100644
--- a/install.sh
+++ b/install.sh
@@ -218,6 +218,9 @@ initVar() {
 
 # 读取tls证书详情
 readAcmeTLS() {
+	if [[ -n "${currentHost}" ]]; then
+		dnsTLSDomain=$(echo "${currentHost}" | awk -F "[.]" '{print $(NF-1)"."$NF}')
+	fi
 	if [[ -d "$HOME/.acme.sh/*.${dnsTLSDomain}_ecc" && -f "$HOME/.acme.sh/*.${dnsTLSDomain}_ecc/*.${dnsTLSDomain}.key" && -f "$HOME/.acme.sh/*.${dnsTLSDomain}_ecc/*.${dnsTLSDomain}.cer" ]]; then
 		installDNSACMEStatus=true
 	fi
@@ -1427,9 +1430,11 @@ installCronTLS() {
 
 # 更新证书
 renewalTLS() {
+
 	if [[ -n $1 ]]; then
 		echoContent skyBlue "\n进度  $1/1 : 更新证书"
 	fi
+	readAcmeTLS
 	local domain=${currentHost}
 	if [[ -z "${currentHost}" && -n "${tlsDomain}" ]]; then
 		domain=${tlsDomain}
@@ -1440,7 +1445,6 @@ renewalTLS() {
 			sslRenewalDays=180
 		fi
 	fi
-
 	if [[ -d "$HOME/.acme.sh/${domain}_ecc" && -f "$HOME/.acme.sh/${domain}_ecc/${domain}.key" && -f "$HOME/.acme.sh/${domain}_ecc/${domain}.cer" ]] || [[ "${installDNSACMEStatus}" == "true" ]]; then
 		modifyTime=
 
@@ -4999,7 +5003,7 @@ menu() {
 	cd "$HOME" || exit
 	echoContent red "\n=============================================================="
 	echoContent green "作者:mack-a"
-	echoContent green "当前版本:v2.6.4"
+	echoContent green "当前版本:v2.6.5"
 	echoContent green "Github:https://github.com/mack-a/v2ray-agent"
 	echoContent green "描述:八合一共存脚本\c"
 	showInstallStatus