fix(脚本): 修改v2ray不适配多用户管理生成uuid的问题

pull/534/merge
mack-a 2021-01-01 21:59:59 +08:00
parent c40daa6be5
commit 1cf40f4ee7
1 changed files with 7 additions and 1 deletions

View File

@ -61,6 +61,8 @@ initVar(){
# 核心安装path # 核心安装path
coreInstallPath= coreInstallPath=
# v2ctl Path
ctlPath=
# 1.全部安装 # 1.全部安装
# 2.个性化安装 # 2.个性化安装
v2rayAgentInstallType= v2rayAgentInstallType=
@ -123,10 +125,12 @@ readInstallType(){
# 不带XTLS的v2ray-core # 不带XTLS的v2ray-core
coreInstallType=2 coreInstallType=2
coreInstallPath=/etc/v2ray-agent/v2ray/v2ray coreInstallPath=/etc/v2ray-agent/v2ray/v2ray
ctlPath=/etc/v2ray-agent/v2ray/v2ctl
elif [[ ! -z `cat /etc/v2ray-agent/v2ray/conf/02_VLESS_TCP_inbounds.json|grep xtls` ]] elif [[ ! -z `cat /etc/v2ray-agent/v2ray/conf/02_VLESS_TCP_inbounds.json|grep xtls` ]]
then then
# 带XTLS的v2ray-core # 带XTLS的v2ray-core
coreInstallPath=/etc/v2ray-agent/v2ray/v2ray coreInstallPath=/etc/v2ray-agent/v2ray/v2ray
ctlPath=/etc/v2ray-agent/v2ray/v2ctl
coreInstallType=3 coreInstallType=3
fi fi
fi fi
@ -140,6 +144,7 @@ readInstallType(){
# xray-core # xray-core
configPath=/etc/v2ray-agent/xray/conf/ configPath=/etc/v2ray-agent/xray/conf/
coreInstallPath=/etc/v2ray-agent/xray/xray coreInstallPath=/etc/v2ray-agent/xray/xray
ctlPath=/etc/v2ray-agent/xray/xray
coreInstallType=1 coreInstallType=1
fi fi
fi fi
@ -2603,6 +2608,7 @@ addUser(){
customUUID customUUID
customUserEmail customUserEmail
fi fi
while [[ ${userNum} -gt 0 ]] while [[ ${userNum} -gt 0 ]]
do do
let userNum-- let userNum--
@ -2610,7 +2616,7 @@ addUser(){
then then
uuid=${currentCustomUUID} uuid=${currentCustomUUID}
else else
uuid=`${coreInstallPath} uuid` uuid=`${ctlPath} uuid`
fi fi
if [[ ! -z "${currentCustomEmail}" ]] if [[ ! -z "${currentCustomEmail}" ]]