From c38f0a98fc489897b1c6b9aa0e172dcb6001703a Mon Sep 17 00:00:00 2001 From: SuperManito <68613938+SuperManito@users.noreply.github.com> Date: Mon, 15 Jul 2024 17:50:09 +0800 Subject: [PATCH] =?UTF-8?q?=E9=80=82=E9=85=8D=E8=BF=91=E6=9C=9F=E7=BB=93?= =?UTF-8?q?=E6=9D=9F=E7=94=9F=E5=91=BD=E5=91=A8=E6=9C=9F=E7=9A=84=E6=93=8D?= =?UTF-8?q?=E4=BD=9C=E7=B3=BB=E7=BB=9F=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ChangeMirrors.sh | 34 ++++++++++++++++++---------------- docs/mirrors/index.md | 2 +- docs/use/command-options.md | 2 +- requirements.txt | 2 +- 4 files changed, 21 insertions(+), 19 deletions(-) diff --git a/ChangeMirrors.sh b/ChangeMirrors.sh index 42e4bbb..c34970c 100755 --- a/ChangeMirrors.sh +++ b/ChangeMirrors.sh @@ -1,6 +1,6 @@ #!/bin/bash ## Author: SuperManito -## Modified: 2024-06-20 +## Modified: 2024-07-15 ## License: MIT ## GitHub: https://github.com/SuperManito/LinuxMirrors ## Website: https://linuxmirrors.cn @@ -372,14 +372,21 @@ function EnvJudgment() { case "${SYSTEM_JUDGMENT}" in "${SYSTEM_DEBIAN}") case ${SYSTEM_VERSION_NUMBER:0:1} in - 8 | 9) - SOURCE_BRANCH="debian-archive" + 8 | 9 | 10) + SOURCE_BRANCH="debian-archive" # EOF ;; *) SOURCE_BRANCH="debian" ;; esac ;; + "${SYSTEM_UBUNTU}") + if [[ "${DEVICE_ARCH}" == "x86_64" ]] || [[ "${DEVICE_ARCH}" == *i?86* ]]; then + SOURCE_BRANCH="ubuntu" + else + SOURCE_BRANCH="ubuntu-ports" + fi + ;; "${SYSTEM_RHEL}") case ${SYSTEM_VERSION_NUMBER:0:1} in 9) @@ -392,7 +399,7 @@ function EnvJudgment() { ;; "${SYSTEM_CENTOS}") if [[ "${DEVICE_ARCH}" == "x86_64" ]]; then - SOURCE_BRANCH="centos" + SOURCE_BRANCH="centos-vault" # EOF else SOURCE_BRANCH="centos-altarch" fi @@ -411,13 +418,6 @@ function EnvJudgment() { ;; esac ;; - "${SYSTEM_UBUNTU}") - if [[ "${DEVICE_ARCH}" == "x86_64" ]] || [[ "${DEVICE_ARCH}" == *i?86* ]]; then - SOURCE_BRANCH="ubuntu" - else - SOURCE_BRANCH="ubuntu-ports" - fi - ;; "${SYSTEM_ARCH}") if [[ "${DEVICE_ARCH}" == "x86_64" ]] || [[ "${DEVICE_ARCH}" == *i?86* ]]; then SOURCE_BRANCH="archlinux" @@ -1363,18 +1363,20 @@ function RedHatMirrors() { "${SYSTEM_CENTOS}") sed -i "s|^#baseurl=http|baseurl=${WEB_PROTOCOL}|g" CentOS-* sed -i 's|^mirrorlist=|#mirrorlist=|g' CentOS-* + ## CentOS 7/8 操作系统版本结束了生命周期（EOL），Linux 社区已不再维护该操作系统版本 case ${SYSTEM_VERSION_NUMBER:0:1} in 8) - ## CentOS 8 操作系统版本结束了生命周期（EOL），Linux 社区已不再维护该操作系统版本，最终版本为 8.5.2011 - # 原 centos 镜像中的 CentOS 8 相关内容已被官方移动，从 2022-02 开始切换至 centos-vault 源 - sed -i "s|mirror.centos.org/\$contentdir|mirror.centos.org/centos-vault|g" CentOS-* + # 最终版本为 8.5.2011，从 2022-02 开始切换至 centos-vault 分支 + sed -i "s|mirror.centos.org/\$contentdir|mirror.centos.org/${SOURCE_BRANCH:-"centos-vault"}|g" CentOS-* sed -i "s/\$releasever/8.5.2111/g" CentOS-* # 单独处理 CentOS-Linux-Sources.repo sed -i "s|vault.centos.org/\$contentdir|${SOURCE_VAULT:-"${SOURCE}"}/${SOURCE_BRANCH_VAULT:-"centos-vault"}|g" CentOS-Linux-Sources.repo ;; 7) - sed -i "s|mirror.centos.org/\$contentdir|mirror.centos.org/${SOURCE_BRANCH}|g" CentOS-* - sed -i "s|vault.centos.org/centos|${SOURCE_VAULT:-"${SOURCE}"}/${SOURCE_BRANCH_VAULT:-"${SOURCE_BRANCH}"}|g" CentOS-Sources.repo # 单独处理 CentOS-Sources.repo + # 最终版本为 7.9.2009，从 2024-07 开始切换至 centos-vault 分支 + sed -i "s|mirror.centos.org/centos|mirror.centos.org/${SOURCE_BRANCH:-"centos-vault"}|g" CentOS-* + sed -i "s/\$releasever/7.9.2009/g" CentOS-* + sed -i "s|vault.centos.org/centos|${SOURCE_VAULT:-"${SOURCE}"}/${SOURCE_BRANCH_VAULT:-"centos-vault"}|g" CentOS-Sources.repo # 单独处理 CentOS-Sources.repo ;; esac sed -i "s|mirror.centos.org|${SOURCE}|g" CentOS-* diff --git a/docs/mirrors/index.md b/docs/mirrors/index.md index 7f473d1..6570abb 100644 --- a/docs/mirrors/index.md +++ b/docs/mirrors/index.md @@ -33,7 +33,7 @@ hide: 如果这里没有想使用的镜像站那可以看看其它运行模式和命令选项。软件源的速度区分刷新速度和下行速率，后者才是关键，具体请结合实际地理位置选择尝试，还可以通过[辅助工具网站](#工具网站)进行一些测试 - :material-thumb-up-outline: 使用建议：速度上推荐 `中科大`、`字节跳动(火山引擎)`，地域兼容性上推荐 `腾讯云`、`阿里云`，海外或复杂网络环境下不建议使用 `清华(TUNA)` `浙江大学` 等容易阻断的镜像站，这有违自由软件的初衷 + :material-thumb-up-outline: 使用建议：速度上推荐 `中科大`、`字节跳动(火山引擎)`，地域兼容性上推荐 `腾讯云`、`阿里云`，海外或复杂网络环境下不建议使用 `清华(TUNA)` `浙江大学` 等容易阻断的镜像站 ??? note "中国大陆教育网软件源列表" diff --git a/docs/use/command-options.md b/docs/use/command-options.md index 2797fa7..7309e42 100644 --- a/docs/use/command-options.md +++ b/docs/use/command-options.md @@ -44,7 +44,7 @@ bash <(curl -sSL https://linuxmirrors.cn/main.sh) \
| 系统名称 | 涉及的分支名称 | | --- | :---: | -| Debian | debian | +| Debian | debian / debian-archive | | Ubuntu | ubuntu / ubuntu-ports | | Kali Linux | kali | | Deepin | deepin | diff --git a/requirements.txt b/requirements.txt index c815492..b45f3b6 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,3 +1,3 @@ -mkdocs-material==9.5.27 +mkdocs-material==9.5.29 mkdocs-glightbox==0.4.0 mkdocs-exclude-search==0.6.6 \ No newline at end of file