feat(脚本): 添加qrencode、添加订阅二维码展示

pull/534/merge
mack-a 2021-01-19 14:54:59 +08:00
parent 067c4ca79b
commit 6c68d10e9b
1 changed files with 8 additions and 1 deletions

View File

@ -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 "urlhttps://${currentHost}/s/${email}"
echo "https://${currentHost}/s/${email}" | qrencode -s 10 -m 1 -t UTF8
echoContent skyBlue "--------------------------------------------------------------"
done
fi