mirror of
https://gitlab.com/fscarmen/warp.git
synced 2026-06-15 03:25:42 +08:00
wg-go-reserved depand on wg-tools version.
Former-commit-id: edc95417d434f742f52fe374d04511ba76b9cbf0
This commit is contained in:
fscarmen
@@ -23,7 +23,7 @@
|
||||
* * *
|
||||
|
||||
## 更新信息
|
||||
2023.6.30 menu.sh V3.00 beta IMPORTANT: 1. Use Cloudflare official warp api to replace wgcf; 2. Use wireguard-go with reserved to replace kernel. Make Hong Kong, Los Angeles and other restricted areas use warp; The above are the works of Badafans, I would like to thank Badafans and warp-go author coia for their contributions on behalf of all users of this script; 3. Since the changes are too big, please ask users to reinstall, if you have any problems, please feedback, I will deal with it as soon as possible; 重要更新: 1. 全面用 Cloudflare 官方 warp api 替代 wgcf; 2. 使用 wireguard-go with reserved 替代内核。使香港，洛杉矶等受限地区使用 warp; 以上均是大神 badafans 的作品，我谨代表本脚本的所有用户感谢 badafans 和 warp-go 作者 coia 的贡献; 3.由于改动太大，请用户重新安装，如有问题请反馈，我将会尽快处理
|
||||
2023.6.30 menu.sh V3.00 beta IMPORTANT: 1. Use Cloudflare official warp api to replace wgcf; 2. Use wireguard-go with reserved to replace kernel. Make Hong Kong, Los Angeles and other restricted areas use warp; The above are the works of enthusiastic user, I would like to thank this guy and warp-go author coia for their contributions on behalf of all users of this script; 3. Since the changes are too big, please ask users to reinstall, if you have any problems, please feedback, I will deal with it as soon as possible; 重要更新: 1. 全面用 Cloudflare 官方 warp api 替代 wgcf; 2. 使用 wireguard-go with reserved 替代内核。使香港，洛杉矶等受限地区使用 warp; 以上均是热心网友的作品，我谨代表本脚本的所有用户感谢这位网友和 warp-go 作者 coia 的贡献; 3.由于改动太大，请用户重新安装，如有问题请反馈，我将会尽快处理
|
||||
|
||||
2023.6.27 menu.sh V2.53 Wireproxy proxy mode supports warp dualstack. From now on wgcf / wireproxy / client all support dual stack; Client Proxy 模式支持 warp 双栈， 从此之后 wgcf / wireproxy / client 通通支持双栈
|
||||
|
||||
@@ -645,7 +645,6 @@ https://github.com/acacia233/Project-WARP-Unlock
|
||||
* WGCF 项目原作者: https://github.com/ViRb3/wgcf/
|
||||
* Coia 和 warp-go 团队: https://gitlab.com/ProjectWARP/warp-go
|
||||
* warp-go api wiki: https://docs.zeroteam.top/apis/warp
|
||||
* wireguard-go reserved 作者 badafans: https://github.com/badafans/
|
||||
* WireGuard-GO 官方: https://git.zx2c4.com/wireguard-go/
|
||||
* ylx2016 的成熟作品: https://github.com/ylx2016/Linux-NetSpeed
|
||||
* ALIILAPRO 的成熟作品: https://github.com/ALIILAPRO/warp-plus-cloudflare
|
||||
|
||||
@@ -13,8 +13,8 @@ export DEBIAN_FRONTEND=noninteractive
|
||||
|
||||
E[0]="\n Language:\n 1. English (default) \n 2. 简体中文\n"
|
||||
C[0]="${E[0]}"
|
||||
E[1]="IMPORTANT: 1. Use Cloudflare official warp api to replace wgcf; 2. Use wireguard-go with reserved to replace kernel. Make Hong Kong, Los Angeles and other restricted areas use warp; The above are the works of Badafans, I would like to thank Badafans and warp-go author coia for their contributions on behalf of all users of this script; 3. Since the changes are too big, please ask users to reinstall, if you have any problems, please feedback, I will deal with it as soon as possible."
|
||||
C[1]="重要更新: 1. 全面用 Cloudflare 官方 warp api 替代 wgcf; 2. 使用 wireguard-go with reserved 替代内核。使香港，洛杉矶等受限地区使用 warp; 以上均是大神 badafans 的作品，我谨代表本脚本的所有用户感谢 badafans 和 warp-go 作者 coia 的贡献; 3.由于改动太大，请用户重新安装，如有问题请反馈，我将会尽快处理"
|
||||
E[1]="IMPORTANT: 1. Use Cloudflare official warp api to replace wgcf; 2. Use wireguard-go with reserved to replace kernel. Make Hong Kong, Los Angeles and other restricted areas use warp; The above are the works of enthusiastic user, I would like to thank this guy and warp-go author coia for their contributions on behalf of all users of this script; 3. Since the changes are too big, please ask users to reinstall, if you have any problems, please feedback, I will deal with it as soon as possible."
|
||||
C[1]="重要更新: 1. 全面用 Cloudflare 官方 warp api 替代 wgcf; 2. 使用 wireguard-go with reserved 替代内核。使香港，洛杉矶等受限地区使用 warp; 以上均是热心网友的作品，我谨代表本脚本的所有用户感谢这位网友和 warp-go 作者 coia 的贡献; 3.由于改动太大，请用户重新安装，如有问题请反馈，我将会尽快处理"
|
||||
E[2]="The script must be run as root, you can enter sudo -i and then download and run again. Feedback: [https://github.com/fscarmen/warp/issues]"
|
||||
C[2]="必须以root方式运行脚本，可以输入 sudo -i 后重新下载运行，问题反馈:[https://github.com/fscarmen/warp/issues]"
|
||||
E[3]="The TUN module is not loaded. You should turn it on in the control panel. Ask the supplier for more help. Feedback: [https://github.com/fscarmen/warp/issues]"
|
||||
@@ -1736,9 +1736,6 @@ install() {
|
||||
|
||||
# 注册 WARP 账户 (将生成 warp-account.conf 文件保存账户信息)
|
||||
{
|
||||
# 下载 wireguard-go reserved 版本，将文件的可执行权限打开
|
||||
wget --no-check-certificate $CDN -O /usr/bin/wireguard-go https://raw.githubusercontent.com/fscarmen/Render/main/w/wireguard-go-linux-$ARCHITECTURE && chmod +x /usr/bin/wireguard-go
|
||||
|
||||
# 如安装 WireProxy ，尽量下载官方的最新版本，如官方 WireProxy 下载不成功，将使用 githubusercontent，以更好的支持双栈。并添加执行权限
|
||||
if [ "$OCTEEP" = 1 ]; then
|
||||
wireproxy_latest=$(wget --no-check-certificate -qO- -T1 -t1 $CDN "https://api.github.com/repos/octeep/wireproxy/releases/latest" | grep "tag_name" | head -n 1 | cut -d : -f2 | sed 's/[ \"v,]//g')
|
||||
@@ -1835,9 +1832,6 @@ EOF
|
||||
# 安装一些必要的网络工具包和wireguard-tools (Wire-Guard 配置工具:wg、wg-quick)
|
||||
${PACKAGE_INSTALL[int]} --no-install-recommends net-tools openresolv dnsutils iptables
|
||||
[ "$OCTEEP" != 1 ] && ${PACKAGE_INSTALL[int]} --no-install-recommends wireguard-tools
|
||||
|
||||
# 如 Linux 版本低于5.6并且是 kvm，则安装 wireguard 内核模块
|
||||
[ "$WG" = 1 ] && ${PACKAGE_INSTALL[int]} --no-install-recommends linux-headers-$(uname -r) && ${PACKAGE_INSTALL[int]} --no-install-recommends wireguard-dkms
|
||||
;;
|
||||
|
||||
Ubuntu )
|
||||
@@ -1856,12 +1850,6 @@ EOF
|
||||
${PACKAGE_INSTALL[int]} net-tools iptables
|
||||
[ "$OCTEEP" != 1 ] && ${PACKAGE_INSTALL[int]} wireguard-tools
|
||||
|
||||
# 如 Linux 版本低于5.6并且是 kvm，则安装 wireguard 内核模块
|
||||
VERSION_ID=$(expr "$SYS" : '.*\s\([0-9]\{1,\}\)\.*')
|
||||
[ "$ARCHITECTURE" != s390x ] && [ "$WG" = 1 ] && curl -Lo /etc/yum.repos.d/wireguard.repo https://copr.fedorainfracloud.org/coprs/jdoss/wireguard/repo/epel-"$VERSION_ID"/jdoss-wireguard-epel-"$VERSION_ID".repo &&
|
||||
|
||||
${PACKAGE_INSTALL[int]} wireguard-dkms
|
||||
|
||||
# 升级所有包同时也升级软件和系统内核
|
||||
${PACKAGE_UPDATE[int]}
|
||||
|
||||
@@ -1889,6 +1877,11 @@ EOF
|
||||
# 修改 wg-quick 文件，以使用 wireguard-go reserved 版
|
||||
grep -q '^#[[:space:]]*add_if' /usr/bin/wg-quick || sed -i '/add_if$/ {s/^/# /; N; s/\n/& wireguard-go "$INTERFACE"\n/}' /usr/bin/wg-quick
|
||||
|
||||
# 根据 wireguard-tools 版本判断下载 wireguard-go reserved 版本: wg < v1.0.20210223 , wg-go-reserved = v0.0.20201118-reserved; wg >= v1.0.20210223 , wg-go-reserved = v0.0.20230223-reserved
|
||||
local WIREGUARD_TOOLS_VERSION=$(wg --version | sed "s#.* v1\.0\.\([0-9]\+\) .*#\1#g")
|
||||
[[ "$WIREGUARD_TOOLS_VERSION" -lt 20210223 ]] && local WIREGUARD_GO_VERSION=20201118 || local WIREGUARD_GO_VERSION=20230223
|
||||
wget --no-check-certificate $CDN -O /usr/bin/wireguard-go https://raw.githubusercontent.com/fscarmen/warp/main/wireguard-go/wireguard-go-linux-$ARCHITECTURE-$WIREGUARD_GO_VERSION && chmod +x /usr/bin/wireguard-go
|
||||
|
||||
wait
|
||||
|
||||
# WARP 配置修改
|
||||
|
||||
@@ -0,0 +1 @@
|
||||
c2d58ffc562d51f07dc75974d8b75725808d4f87
|
||||
@@ -0,0 +1 @@
|
||||
f43a036953991f514939c37166efa9d783623da9
|
||||
@@ -0,0 +1 @@
|
||||
7679aa23bd4a5f9f92f33f6c80364ff54f30830e
|
||||
@@ -0,0 +1 @@
|
||||
68d38c9cb37290646061f044501bf2c54b140b26
|
||||
@@ -0,0 +1 @@
|
||||
3a593882a3a54fb8a0b52b6909b368ee058c08d9
|
||||
@@ -0,0 +1 @@
|
||||
e656d2e11f3a417c838951283a3e2b77dc71123b
|
||||
@@ -0,0 +1 @@
|
||||
e2c36af963da2aaa9557ba758e4a2734852b1356
|
||||
@@ -0,0 +1 @@
|
||||
114b44bbfda037a694e661ccc30193e20c420e6c
|
||||
@@ -0,0 +1 @@
|
||||
d094e3f36e6217e555725c2231fb35bad570d7c3
|
||||
@@ -0,0 +1 @@
|
||||
baf6a616925028095f6520bb4073e2841144b498
|
||||
@@ -0,0 +1 @@
|
||||
25d8bff64809f6de693f2b7ba8fbc08074cf9197
|
||||
@@ -0,0 +1 @@
|
||||
20ffed20421bebadf6bc1f4096f81d1f74c26744
|
||||
@@ -0,0 +1 @@
|
||||
24e3c37f4da1a961729b92d7fa894c14b5e76c05
|
||||
@@ -0,0 +1 @@
|
||||
2da642005431e555a71d5a52b45595b94086b009
|
||||
@@ -0,0 +1 @@
|
||||
a55665d3340f0c8c48549020fe9ac365655b99c1
|
||||
@@ -0,0 +1 @@
|
||||
9c0e94bdb4f70ca58ba39ffe2c2173d61f1fb2af
|
||||
@@ -0,0 +1 @@
|
||||
9850bdabf55488d3fe72f09e98db29dc7fbde6bb
|
||||
@@ -0,0 +1 @@
|
||||
6f84b4c2cb8d4c86478429e4090047144fc2efba
|
||||
@@ -0,0 +1 @@
|
||||
0bf50a18a591e55d33de2c575fd3c9797984fec5
|
||||
@@ -0,0 +1 @@
|
||||
8dfa07fa4cd214a9614646bf1a8d1b9133aacc8b
|
||||
@@ -0,0 +1 @@
|
||||
8f41b875d3508a1f6728a266ecd4b4247761f5a5
|
||||
@@ -0,0 +1 @@
|
||||
e80e9783974e72af73b8265e740681e7d5a2516b
|
||||
@@ -0,0 +1 @@
|
||||
4c67290e3928d20fe8224a221faba5bf6e15f736
|
||||
@@ -0,0 +1 @@
|
||||
f4029884fc28e0728dacc69b85f31c09bf1a9ffd
|
||||
@@ -0,0 +1 @@
|
||||
1b4c10d618cf2f6e20e6da8e135d5cc7fa48c5eb
|
||||
@@ -0,0 +1 @@
|
||||
c066f75f38151009fb9bd7ab5444448d5016ba39
|
||||
@@ -0,0 +1 @@
|
||||
9d10f40dd4e87c4b198b61efaa9065f577185fbe
|
||||
@@ -0,0 +1 @@
|
||||
5e63c7468af8b9007feab091a9a34f84b7fe6a22
|
||||
@@ -1 +0,0 @@
|
||||
f10c89d5ae18ccaa91b41629a72bcd65b29159d9
|
||||
@@ -1 +0,0 @@
|
||||
a77de41ac0457a7e6aa65bbf64d97673fd44a240
|
||||
@@ -1 +0,0 @@
|
||||
f03f4c5c8f655782c479238a093aacf45d648e00
|
||||
@@ -1 +0,0 @@
|
||||
e41ac3e3dc528203d0b1e2108f00d58c95d81d66
|
||||
Binary file not shown.
@@ -1 +0,0 @@
|
||||
2b6c79d78775c007eccbf870abb44d8a15bb0398
|
||||
@@ -1 +0,0 @@
|
||||
64155a18790da12a6370f6471fa28dce902f14b2
|
||||
Binary file not shown.
Binary file not shown.
@@ -1 +0,0 @@
|
||||
e69421ffa1427f2c13f00b3d3a9c76eea0e6c6f9
|
||||
@@ -1 +0,0 @@
|
||||
9ee87c9dd4a6bde44285831b7462c79d736102df
|
||||
@@ -1 +0,0 @@
|
||||
2d72c8fa41c252a02332bb93032153a7db947c8f
|
||||
@@ -1 +0,0 @@
|
||||
2ed8dbe38900f7122803a025266605217a25fd9a
|
||||
Reference in New Issue
Block a user