From 11784f13cc2a2a02f4cee762b29b04b439856227 Mon Sep 17 00:00:00 2001 From: bin456789 Date: Tue, 12 Dec 2023 13:09:03 +0800 Subject: [PATCH] =?UTF-8?q?core:=20=E6=9B=B4=E6=94=B9=20github=20=E4=BB=A3?= =?UTF-8?q?=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 4 ++-- reinstall.bat | 5 +++-- reinstall.sh | 5 +++-- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 9579171..1ac2204 100644 --- a/README.md +++ b/README.md @@ -29,7 +29,7 @@ curl -O https://raw.githubusercontent.com/bin456789/reinstall/main/reinstall.sh ### 下载 (国内) ```bash -curl -O https://ghps.cc/https://raw.githubusercontent.com/bin456789/reinstall/main/reinstall.sh +curl -O https://raw.fgit.cf/bin456789/reinstall/main/reinstall.sh ``` ### 用法 1: 安装 Linux @@ -135,7 +135,7 @@ certutil -urlcache -f -split https://raw.githubusercontent.com/bin456789/reinsta ### 下载(国内) ```batch -certutil -urlcache -f -split https://ghps.cc/https://raw.githubusercontent.com/bin456789/reinstall/main/reinstall.bat +certutil -urlcache -f -split https://raw.fgit.cf/bin456789/reinstall/main/reinstall.bat ``` ### 如果无法下载 diff --git a/reinstall.bat b/reinstall.bat index ca84046..e56da0c 100644 --- a/reinstall.bat +++ b/reinstall.bat @@ -1,7 +1,7 @@ @echo off setlocal EnableDelayedExpansion set confhome=https://raw.githubusercontent.com/bin456789/reinstall/main -set github_proxy=https://ghps.cc +set github_proxy=raw.fgit.cf :: Windows 7 SP1 winhttp 默认不支持 tls 1.2 :: https://support.microsoft.com/en-us/topic/update-to-enable-tls-1-1-and-tls-1-2-as-default-secure-protocols-in-winhttp-in-windows-c4bd73d2-31d7-761e-0178-11268bb10392 @@ -35,7 +35,8 @@ if !errorlevel! == 0 ( if defined github_proxy ( echo !confhome! | findstr /c:"://raw.githubusercontent.com/" >nul if !errorlevel! == 0 ( - set confhome=!github_proxy!/!confhome! + rem set confhome=!github_proxy!/!confhome! + set confhome=!confhome:raw.githubusercontent.com=%github_proxy%! ) ) ) else ( diff --git a/reinstall.sh b/reinstall.sh index 62122f6..02bd956 100644 --- a/reinstall.sh +++ b/reinstall.sh @@ -3,7 +3,7 @@ set -eE confhome=https://raw.githubusercontent.com/bin456789/reinstall/main -github_proxy=https://ghps.cc +github_proxy=raw.fgit.cf this_script=$(realpath "$0") trap 'trap_err $LINENO $?' ERR @@ -1338,7 +1338,8 @@ esac # jsdelivr 有12小时缓存 # https://github.com/XIU2/UserScript/blob/master/GithubEnhanced-High-Speed-Download.user.js#L31 if [ -n "$github_proxy" ] && [[ "$confhome" = http*://raw.githubusercontent.com/* ]] && is_in_china; then - confhome=$github_proxy/$confhome + # confhome=$github_proxy/$confhome + confhome=${confhome/raw.githubusercontent.com/$github_proxy} fi # 以下目标系统不需要两步安装