admin/warp
1
0
Fork 0
mirror of https://gitlab.com/fscarmen/warp.git synced 2026-06-15 03:25:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix some bugs.

Browse Source 
Former-commit-id: 8e0b2e5a1faad2c70823078bf20059ca937b27c8
This commit is contained in:
fscarmen
2023-05-21 06:24:21 +00:00
parent 49f0b6d95a
commit 3dc4633521
2 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
menu.sh
+4 -5
View File
@@ -1527,8 +1527,7 @@ install() {
latest=${latest:-'2.2.17'}
# 安装 wgcf，尽量下载官方的最新版本，如官方 wgcf 下载不成功，将使用 githubusercontent，以更好的支持双栈。并添加执行权限
wget --no-check-certificate -T1 -t1 $CDN -O /usr/bin/wgcf https://github.com/ViRb3/wgcf/releases/download/v"$latest"/wgcf_"$latest"_linux_$ARCHITECTURE ||
wget --no-check-certificate $CDN -O /usr/bin/wgcf https://raw.githubusercontent.com/fscarmen/warp/main/wgcf/wgcf_"$latest"_linux_$ARCHITECTURE
wget --no-check-certificate -T20 -t2 $CDN -O /usr/bin/wgcf https://raw.githubusercontent.com/fscarmen/warp/main/wgcf/wgcf_"$latest"_linux_$ARCHITECTURE
chmod +x /usr/bin/wgcf
# 如安装 WireProxy ，尽量下载官方的最新版本，如官方 WireProxy 下载不成功，将使用 githubusercontent，以更好的支持双栈。并添加执行权限
@@ -1910,7 +1909,7 @@ client_install() {
mkdir -p /etc/wireguard/ >/dev/null 2>&1
if [ "$CLIENT" = 0 ]; then info " $(text 83) "
if [ "$SYSTEM" = CentOS ]; then
{ wget https://raw.githubusercontent.com/fscarmen/warp/main//Client/Client_CentOS_8.rpm; } &
{ wget https://raw.githubusercontent.com/fscarmen/warp/main/Client/Client_CentOS_8.rpm; } &
[ ! $(type -p desktop-file-install) ] && ${PACKAGE_INSTALL[int]} desktop-file-utils
case "$(expr "$SYS" : '.*\s\([0-9]\{1,\}\)\.*')" in
7 ) # CentOS 7，需要用 Cloudflare CentOS 8 的库以安装 Client，并在线编译升级 C 运行库 Glibc 2.28
@@ -1938,7 +1937,7 @@ client_install() {
esac
rm -f Client_CentOS_8.rpm
else
{ wget --no-check-certificate $CDN https://raw.githubusercontent.com/fscarmen/warp/main//Client/Client_${SYSTEM}_${VERSION_ID}.deb; }&
{ wget --no-check-certificate $CDN https://raw.githubusercontent.com/fscarmen/warp/main/Client/Client_${SYSTEM}_${VERSION_ID}.deb; }&
${PACKAGE_UPDATE[int]}
[[ "$SYSTEM" = Debian && ! $(apt list 2>/dev/null | grep apt-transport-https) =~ installed ]] && ${PACKAGE_INSTALL[int]} apt-transport-https
wait
@@ -2382,7 +2381,7 @@ menu_setting() {
# 显示菜单
menu() {
# clear
clear
hint " $(text 16) "
echo -e "======================================================================================================================\n"
info " $(text 17):$VERSION\n $(text 18):$(text 1)\n $(text 19):\n\t $(text 20):$SYS\n\t $(text 21):$(uname -r)\n\t $(text 22):$ARCHITECTURE\n\t $(text 23):$VIRT "
warp-go.sh
+1 -3
View File
@@ -769,7 +769,7 @@ EOF
bash /opt/warp-go/tun.sh
TUN=$(cat /dev/net/tun 2>&1 | tr 'A-Z' 'a-z')
if [[ ! "$TUN" =~ 'in bad state' ]] && [[ ! "$TUN" =~ '处于错误状态' ]] && [[ ! "$TUN" =~ 'Die Dateizugriffsnummer ist in schlechter Verfassung' ]]; then
rm -f /usr/bin/tun.sh && error "$(text 36)"
rm -f /opt/warp-go/tun.sh && error "$(text 36)"
else
chmod +x /opt/warp-go/tun.sh
echo "$SYSTEM" | grep -qvE "Alpine|OpenWrt" && echo "@reboot root bash /opt/warp-go/tun.sh" >> /etc/crontab
@@ -1028,8 +1028,6 @@ KeepAlive = 30
#PostUp =
#PostDown =
EOF
cp /opt/warp-go/warp.conf /root/hahahah
fi
# 注册免费和 Plus 账户