renun/NTrace-core
1
0
Fork 0
mirror of https://github.com/nxtrace/NTrace-core.git synced 2025-08-12 06:26:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

改善脚本在国内环境下的表现

Browse Source
This commit is contained in:
tsosunchia
2022-05-31 18:27:22 +08:00
parent f0d7151144
commit 9b0e58359f
2 changed files with 56 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
nt_install.sh
View File

@@ -59,6 +59,32 @@ checkSystemDistribution() {
esac
}
getLocation() {
red "正在获取地理位置信息..."
countryCode=$(curl -s "http://ip-api.com/line/?fields=countryCode")
if [ "$countryCode" == "CN" ]; then
if [[ $auto == True ]]; then
URLprefix="https://ghproxy.com/"
else
read -r -p "检测到国内网络环境，是否使用镜像下载以加速(n/y)[y]" input
case $input in
[yY][eE][sS] | [yY])
URLprefix="https://ghproxy.com/"
;;
[nN][oO] | [nN])
URLprefix=""
red "您选择了不使用镜像，下载可能会变得异常缓慢，或者失败"
;;
*)
URLprefix="https://ghproxy.com/"
;;
esac
fi
fi
}
ask_if() {
local choice=""
red "${1}"
@@ -96,31 +122,6 @@ ask_update_script() {
fi
}
getLocation() {
red "正在获取地理位置信息..."
countryCode=$(curl -s "http://ip-api.com/line/?fields=countryCode")
if [ "$countryCode" == "CN" ]; then
if [[ $auto == True ]]; then
URLprefix="https://ghproxy.com/"
else
read -r -p "检测到国内网络环境，是否使用镜像下载以加速(n/y)[y]" input
case $input in
[yY][eE][sS] | [yY])
URLprefix="https://ghproxy.com/"
;;
[nN][oO] | [nN])
red "您选择了不使用镜像，下载可能会变得异常缓慢，或者失败"
;;
*)
URLprefix="https://ghproxy.com/"
;;
esac
fi
fi
}
checkPackageManger() {
if [[ ${osDistribution} == "darwin" ]]; then
# brew update

34
quicklytest.sh
View File

@@ -21,11 +21,36 @@ check_root() {
checkNexttrace() {
echo -e "${Info} 正在检查Nexttrace...(若未安装NextTrace则开始安装)"
if curl -sL -O "https://github.com/xgadget-lab/nexttrace/raw/main/nt_install.sh" || curl -sL -O "https://github.com/xgadget-lab/nexttrace/raw/main/nt_install.sh"; then
if curl -sL -O ${URLprefix}"https://raw.githubusercontent.com/xgadget-lab/nexttrace/main/nt_install.sh" || curl -sL -O ${URLprefix}"https://raw.githubusercontent.com/xgadget-lab/nexttrace/main/nt_install.sh"; then
bash nt_install.sh #--auto #>/dev/null
fi
}
getLocation() {
red "正在获取地理位置信息..."
countryCode=$(curl -s "http://ip-api.com/line/?fields=countryCode")
if [ "$countryCode" == "CN" ]; then
if [[ $auto == True ]]; then
URLprefix="https://ghproxy.com/"
else
read -r -p "检测到国内网络环境，是否使用镜像下载以加速(n/y)[y]" input
case $input in
[yY][eE][sS] | [yY])
URLprefix="https://ghproxy.com/"
;;
[nN][oO] | [nN])
red "您选择了不使用镜像，下载可能会变得异常缓慢，或者失败"
;;
*)
URLprefix="https://ghproxy.com/"
;;
esac
fi
fi
}
ask_if() {
local choice=""
echo -e "${Info} $1"
@@ -52,15 +77,15 @@ checkSystemDistribution() {
#检查脚本更新
check_script_update() {
if [[ ${osDistribution} == "darwin" ]]; then
[ "$(md5 <"${BASH_SOURCE[0]}")" == "$(curl -sL "https://github.com/xgadget-lab/nexttrace/raw/main/quicklytest.sh" | md5)" ] && return 1 || return 0
[ "$(md5 <"${BASH_SOURCE[0]}")" == "$(curl -sL ${URLprefix}"https://raw.githubusercontent.com/xgadget-lab/nexttrace/main/quicklytest.sh" | md5)" ] && return 1 || return 0
else
[ "$(md5sum "${BASH_SOURCE[0]}" | awk '{print $1}')" == "$(md5sum <(curl -sL "https://github.com/xgadget-lab/nexttrace/raw/main/quicklytest.sh") | awk '{print $1}')" ] && return 1 || return 0
[ "$(md5sum "${BASH_SOURCE[0]}" | awk '{print $1}')" == "$(md5sum <(curl -sL ${URLprefix}"https://raw.githubusercontent.com/xgadget-lab/nexttrace/main/quicklytest.sh") | awk '{print $1}')" ] && return 1 || return 0
fi
}
#更新脚本
update_script() {
if curl -sL -o "${BASH_SOURCE[0]}" "https://github.com/xgadget-lab/nexttrace/raw/main/quicklytest.sh" || curl -sL -o "${BASH_SOURCE[0]}" "https://github.com/xgadget-lab/nexttrace/raw/main/quicklytest.sh"; then
if curl -sL -o "${BASH_SOURCE[0]}" ${URLprefix}"https://raw.githubusercontent.com/xgadget-lab/nexttrace/main/quicklytest.sh" || curl -sL -o "${BASH_SOURCE[0]}" ${URLprefix}"https://raw.githubusercontent.com/xgadget-lab/nexttrace/main/quicklytest.sh"; then
echo -e "${Info} quickylytest.sh更新完成，正在重启脚本..."
exec bash "${BASH_SOURCE[0]}"
else
@@ -250,6 +275,7 @@ result_all() {
check_root
checkSystemDistribution
getLocation
ask_update_script
checkNexttrace
check_mode