From 6c68d10e9bdf6b83abd5a38dbf0e2552718a9186 Mon Sep 17 00:00:00 2001
From: mack-a <57424792+mack-a@users.noreply.github.com>
Date: Tue, 19 Jan 2021 14:54:59 +0800
Subject: [PATCH] =?UTF-8?q?feat(=E8=84=9A=E6=9C=AC):=20=E6=B7=BB=E5=8A=A0q?=
 =?UTF-8?q?rencode=E3=80=81=E6=B7=BB=E5=8A=A0=E8=AE=A2=E9=98=85=E4=BA=8C?=
 =?UTF-8?q?=E7=BB=B4=E7=A0=81=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/install.sh b/install.sh
index 8d8a895..18e95e2 100644
--- a/install.sh
+++ b/install.sh
@@ -387,6 +387,11 @@ installTools() {
 		${installType} inetutils-ping >/dev/null 2>&1
 	fi
 
+	if ! find /usr/bin /usr/sbin | grep -q -w qrencode; then
+		echoContent green " ---> 安装qrencode"
+		${installType} qrencode >/dev/null 2>&1
+	fi
+
 	if ! find /usr/bin /usr/sbin | grep -q -w nginx; then
 		echoContent green " ---> 安装nginx"
 		if [[ "${centosVersion}" == "8" ]]; then
@@ -1646,6 +1651,8 @@ initXrayConfig() {
 		read -r -p "读取到上次安装记录，是否使用上次安装时的UUID ？[y/n]:" historyUUIDStatus
 		if [[ "${historyUUIDStatus}" == "y" ]]; then
 			uuid=${currentUUID}
+		else
+			uuid=$(/etc/v2ray-agent/xray/xray uuid)
 		fi
 	else
 		uuid=$(/etc/v2ray-agent/xray/xray uuid)
@@ -3054,10 +3061,10 @@ subscribe() {
 			ls /etc/v2ray-agent/subscribe | while read -r email; do
 				local base64Result=$(base64 -w 0 /etc/v2ray-agent/subscribe/${email})
 				echo ${base64Result} >"/etc/v2ray-agent/subscribe/${email}"
-				echoContent skyBlue "-------------------------备注----------------------------------"
 				echoContent skyBlue "--------------------------------------------------------------"
 				echoContent yellow "email：$(echo "${email}" | awk -F "[_]" '{print $1}')"
 				echoContent yellow "url：https://${currentHost}/s/${email}"
+				echo "https://${currentHost}/s/${email}" | qrencode -s 10 -m 1 -t UTF8
 				echoContent skyBlue "--------------------------------------------------------------"
 			done
 		fi