From a422f4cd21a14bd05e5a11c095b0b21e99edee31 Mon Sep 17 00:00:00 2001 From: mack-a <57424792+mack-a@users.noreply.github.com> Date: Fri, 18 Mar 2022 11:51:00 +0800 Subject: [PATCH] =?UTF-8?q?feat(=E8=84=9A=E6=9C=AC):=20=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E9=87=8D=E8=A3=85=E6=97=B6=E8=AF=BB=E5=8F=96=E4=B8=8D=E5=88=B0?= =?UTF-8?q?=E4=B8=8A=E4=B8=80=E6=AC=A1=E7=9A=84=E9=85=8D=E7=BD=AE=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E6=97=B6=E7=9A=84=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- install.sh | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/install.sh b/install.sh index 9fb40c7..879b115 100644 --- a/install.sh +++ b/install.sh @@ -1639,17 +1639,14 @@ handleXray() { # 获取clients配置 getClients() { local path=$1 + local addClientsStatus=$2 previousClients= if [[ ${addClientsStatus} == "true" ]]; then if [[ ! -f "${path}" ]]; then echo - echoContent yellow "没有读取到此协议上一次安装的配置文件,跳过将采用随机uuid" - echo - read -r -p "是否跳过 ?[y/n]:" skip - if [[ "${skip}" == "n" ]]; then - exit - fi + local protocol=$(echo "${path}" | awk -F "[_]" '{print $2 $3}') + echoContent yellow "没有读取到此协议[${protocol}]上一次安装的配置文件,采用配置文件的第一个uuid" else previousClients=$(jq -r ".inbounds[0].settings.clients" "${path}") fi