Skip to content
This repository was archived by the owner on Feb 20, 2024. It is now read-only.

Commit f2028e9

Browse files
committed
fix: custom UUID
1 parent 8abfb37 commit f2028e9

File tree

2 files changed

+17
-18
lines changed

2 files changed

+17
-18
lines changed

README.md

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
# 原作者:mack-a
2-
# 原项目地址: https://github.com/mack-a/v2ray-agent
3-
41
# v2ray-agent
52

63
> [English Version](https://github.com/reeceyng/v2ray-agent/blob/master/documents/en/README_EN.md)
@@ -95,7 +92,6 @@ wget -P /root -N --no-check-certificate "https://raw.githubusercontent.com/reece
9592
```
9693

9794
- Development Version【开发版】
98-
- 支持xtls-rprx-vision
9995

10096
```
10197
wget -P /root -N --no-check-certificate "https://raw.githubusercontent.com/reeceyng/v2ray-agent/dev/install.sh" && chmod 700 /root/install.sh && /root/install.sh
@@ -105,6 +101,12 @@ wget -P /root -N --no-check-certificate "https://raw.githubusercontent.com/reece
105101

106102
<img src="https://raw.githubusercontent.com/reeceyng/v2ray-agent/master/fodder/install/install.jpg" width=700>
107103

104+
# 版权
105+
106+
- 八合一脚本原作者:[mack-a](https://github.com/mack-a)
107+
- [Reece](https://github.com/reeceyng)
108+
- 以及本项目的所有贡献者
109+
108110
# 许可证
109111

110112
[AGPL-3.0](https://github.com/reeceyng/v2ray-agent/blob/master/LICENSE)

install.sh

Lines changed: 11 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2704,25 +2704,22 @@ initXrayConfig() {
27042704
if [[ "${historyUUIDStatus}" == "y" ]]; then
27052705
uuid=${currentUUID}
27062706
echoContent green "\n ---> 使用成功"
2707-
fi
2708-
else
2709-
if [[ -z "${uuid}" ]]; then
2710-
echoContent yellow "请输入自定义UUID[需合法],[回车]随机UUID"
2711-
read -r -p 'UUID:' customUUID
2712-
2713-
if [[ -n ${customUUID} ]]; then
2714-
uuid=${customUUID}
2715-
else
2716-
uuid=$(/etc/v2ray-agent/xray/xray uuid)
2707+
if [[ -z "${uuid}" ]]; then
2708+
echoContent red "\n ---> uuid读取错误,重新生成"
27172709
fi
2718-
27192710
fi
2711+
fi
27202712

2721-
if [[ -z "${uuid}" ]]; then
2722-
echoContent red "\n ---> uuid读取错误,重新生成"
2713+
if [[ -z "${uuid}" ]]; then
2714+
echoContent yellow "请输入自定义UUID[需合法],[回车]随机UUID"
2715+
read -r -p 'UUID:' customUUID
2716+
if [[ -n ${customUUID} ]]; then
2717+
uuid=${customUUID}
2718+
else
27232719
uuid=$(/etc/v2ray-agent/xray/xray uuid)
27242720
fi
2725-
fi
2721+
fi
2722+
27262723
echoContent yellow "\n ${uuid}"
27272724

27282725
movePreviousConfig

0 commit comments

Comments
 (0)