Skip to content

Commit

Permalink
去除对 cip.cc 的依赖
Browse files Browse the repository at this point in the history
  • Loading branch information
spiritLHLS committed Feb 23, 2025
1 parent ff93dc3 commit 5eb355f
Show file tree
Hide file tree
Showing 8 changed files with 6 additions and 80 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# 更新日志

2025.01.23

- 增加ndpresponder的自动编译,及时更新上游更新。

2024.12.31

- 去除无效的源替换,增加PVE国内镜像源的尝试列表不仅限于清华源
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@

## 更新

2025.01.23
2025.02.23

- 增加ndpresponder的自动编译,及时更新上游更新。
- 去除对 cip.cc 的依赖

[更新日志](CHANGELOG.md)

Expand Down
19 changes: 0 additions & 19 deletions back/fixed_windows.sh
Original file line number Diff line number Diff line change
Expand Up @@ -44,25 +44,6 @@ check_china() {
CN=true
;;
esac
else
if [[ $? -ne 0 ]]; then
if [[ $(curl -m 6 -s cip.cc) =~ "中国" ]]; then
_yellow "根据cip.cc提供的信息,当前IP可能在中国"
read -e -r -p "是否选用中国镜像完成相关组件安装? [Y/n] " input
case $input in
[yY][eE][sS] | [yY])
echo "使用中国镜像"
CN=true
;;
[nN][oO] | [nN])
echo "不使用中国镜像"
;;
*)
echo "不使用中国镜像"
;;
esac
fi
fi
fi
fi
}
Expand Down
19 changes: 0 additions & 19 deletions dockerfiles/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -203,25 +203,6 @@ check_china() {
CN=true
;;
esac
else
if [[ $? -ne 0 ]]; then
if [[ $(curl -m 6 -s cip.cc) =~ "中国" ]]; then
_yellow "根据cip.cc提供的信息,当前IP可能在中国"
read -e -r -p "是否选用中国镜像完成相关组件安装? [Y/n] " input
case $input in
[yY][eE][sS] | [yY])
echo "使用中国镜像"
CN=true
;;
[nN][oO] | [nN])
echo "不使用中国镜像"
;;
*)
echo "不使用中国镜像"
;;
esac
fi
fi
fi
fi
}
Expand Down
7 changes: 0 additions & 7 deletions scripts/buildct.sh
Original file line number Diff line number Diff line change
Expand Up @@ -47,13 +47,6 @@ check_china() {
if [[ $(curl -m 6 -s https://ipapi.co/json | grep 'China') != "" ]]; then
_yellow "根据ipapi.co提供的信息,当前IP可能在中国,使用中国镜像下载"
CN=true
else
if [[ $? -ne 0 ]]; then
if [[ $(curl -m 6 -s cip.cc) =~ "中国" ]]; then
_yellow "根据cip.cc提供的信息,当前IP可能在中国,使用中国镜像下载"
CN=true
fi
fi
fi
fi
}
Expand Down
7 changes: 0 additions & 7 deletions scripts/buildct_onlyv6.sh
Original file line number Diff line number Diff line change
Expand Up @@ -62,13 +62,6 @@ check_china() {
if [[ $(curl -m 6 -s https://ipapi.co/json | grep 'China') != "" ]]; then
_yellow "根据ipapi.co提供的信息,当前IP可能在中国,使用中国镜像下载"
CN=true
else
if [[ $? -ne 0 ]]; then
if [[ $(curl -m 6 -s cip.cc) =~ "中国" ]]; then
_yellow "根据cip.cc提供的信息,当前IP可能在中国,使用中国镜像下载"
CN=true
fi
fi
fi
fi
}
Expand Down
19 changes: 0 additions & 19 deletions scripts/install_pve.sh
Original file line number Diff line number Diff line change
Expand Up @@ -617,25 +617,6 @@ check_china() {
CN=true
;;
esac
else
if [[ $? -ne 0 ]]; then
if [[ $(curl -m 6 -s cip.cc) =~ "中国" ]]; then
_yellow "根据cip.cc提供的信息,当前IP可能在中国"
read -e -r -p "是否选用中国镜像完成相关组件安装? [Y/n] " input
case $input in
[yY][eE][sS] | [yY])
echo "使用中国镜像"
CN=true
;;
[nN][oO] | [nN])
echo "不使用中国镜像"
;;
*)
echo "不使用中国镜像"
;;
esac
fi
fi
fi
fi
}
Expand Down
7 changes: 0 additions & 7 deletions scripts/ssh_bash.sh
Original file line number Diff line number Diff line change
Expand Up @@ -42,13 +42,6 @@ check_china() {
if [[ $(curl -m 6 -s https://ipapi.co/json | grep 'China') != "" ]]; then
echo "根据ipapi.co提供的信息,当前IP可能在中国"
CN=true
else
if [[ $? -ne 0 ]]; then
if [[ $(curl -m 6 -s cip.cc) =~ "中国" ]]; then
echo "根据cip.cc提供的信息,当前IP可能在中国"
CN=true
fi
fi
fi
fi
}
Expand Down

0 comments on commit 5eb355f

Please sign in to comment.