TRKJ/LinuxMirrors
2
0
Fork 0
mirror of https://gitee.com/SuperManito/LinuxMirrors synced 2025-11-03 07:50:28 +08:00
Code Issues Packages Projects Releases Wiki Activity

优化

Browse Source
This commit is contained in:
Super Manito
2025-10-20 08:17:07 +08:00
parent cab4cd8977
commit e26bd0d3f2
2 changed files with 28 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
ChangeMirrors.sh
View File

@@ -1,6 +1,6 @@
#!/bin/bash #!/bin/bash
## Author: SuperManito ## Author: SuperManito
## Modified: 2025-10-14 ## Modified: 2025-10-20
## License: MIT ## License: MIT
## GitHub: https://github.com/SuperManito/LinuxMirrors ## GitHub: https://github.com/SuperManito/LinuxMirrors
## Website: https://linuxmirrors.cn ## Website: https://linuxmirrors.cn
@@ -2248,13 +2248,11 @@ $(gen_deb_unsrc "${source_host}" "${SYSTEM_VERSION_CODENAME}" "${repository_sect
write_source_file write_source_file
## 底层系统软件源 ## 底层系统软件源
local base_system_branch base_system_codename local base_system_branch base_system_codename
if [[ "${SYSTEM_VERSION_ID}" == 6 ]]; then if [[ "${SYSTEM_NAME}" == *"LMDE"* ]]; then
# Debian 版（LMDE） # Debian 版（LMDE）
base_system_branch="debian" base_system_branch="debian"
grep -q "DEBIAN_CODENAME" $File_LinuxRelease base_system_codename="$(get_os_release_value DEBIAN_CODENAME)"
if [ $? -eq 0 ]; then if [[ -z "${base_system_codename}" ]]; then
base_system_codename="$(get_os_release_value DEBIAN_CODENAME)"
else
base_system_codename="bookworm" base_system_codename="bookworm"
fi fi
repository_sections="main contrib non-free non-free-firmware" repository_sections="main contrib non-free non-free-firmware"
@@ -2271,20 +2269,10 @@ $(gen_deb_security "${source_security_host}" "${base_system_codename}" "${reposi
else else
base_system_branch="ubuntu-ports" base_system_branch="ubuntu-ports"
fi fi
case "${SYSTEM_VERSION_ID_MAJOR}" in base_system_codename="$(get_os_release_value UBUNTU_CODENAME)"
22) if [[ -z "${base_system_codename}" ]]; then
base_system_codename="noble" base_system_codename="noble"
;; fi
21)
base_system_codename="jammy"
;;
20)
base_system_codename="focal"
;;
19)
base_system_codename="bionic"
;;
esac
repository_sections="main restricted universe multiverse" repository_sections="main restricted universe multiverse"
source_host="${SOURCE_BASE_SYSTEM:-"${SOURCE}"}/${SOURCE_BASE_SYSTEM_BRANCH:-"${base_system_branch}"}" source_host="${SOURCE_BASE_SYSTEM:-"${SOURCE}"}/${SOURCE_BASE_SYSTEM_BRANCH:-"${base_system_branch}"}"
source_security_host="${SOURCE_SECURITY:-${SOURCE_BASE_SYSTEM:-${SOURCE}}}/${SOURCE_BASE_SYSTEM_BRANCH:-"${base_system_branch}"}" source_security_host="${SOURCE_SECURITY:-${SOURCE_BASE_SYSTEM:-${SOURCE}}}/${SOURCE_BASE_SYSTEM_BRANCH:-"${base_system_branch}"}"

24
DockerInstallation.sh
View File

@@ -620,20 +620,38 @@ function collect_system_info() {
"${SYSTEM_UBUNTU}" | "${SYSTEM_ZORIN}") "${SYSTEM_UBUNTU}" | "${SYSTEM_ZORIN}")
SOURCE_BRANCH="ubuntu" SOURCE_BRANCH="ubuntu"
;; ;;
"${SYSTEM_KALI}")
SOURCE_BRANCH="debian"
SOURCE_BRANCH_CODENAME="trixie"
;;
"${SYSTEM_LINUX_MINT}")
if [[ "${SYSTEM_NAME}" == *"LMDE"* ]]; then
SOURCE_BRANCH="debian"
SOURCE_BRANCH_CODENAME="$(get_os_release_value DEBIAN_CODENAME)"
else
SOURCE_BRANCH="ubuntu"
SOURCE_BRANCH_CODENAME="$(get_os_release_value UBUNTU_CODENAME)"
fi
if [[ -z "${SOURCE_BRANCH_CODENAME}" ]]; then
SOURCE_BRANCH="debian"
SOURCE_BRANCH_CODENAME="bookworm"
fi
;;
"${SYSTEM_RASPBERRY_PI_OS}") "${SYSTEM_RASPBERRY_PI_OS}")
case "${DEVICE_ARCH_RAW}" in case "${DEVICE_ARCH_RAW}" in
x86_64 | aarch64) x86_64 | aarch64)
SOURCE_BRANCH="debian" SOURCE_BRANCH="debian"
;; ;;
*) *)
# 注：自 Docker 29 版本起将不再提供此分支仓库
SOURCE_BRANCH="raspbian" SOURCE_BRANCH="raspbian"
;; ;;
esac esac
;; ;;
*) *)
# 部分 Debian 系衍生操作系统使用 Debian 12 的 docker ce 源 # 其余 Debian 系衍生操作系统
SOURCE_BRANCH="debian" SOURCE_BRANCH="debian"
SYSTEM_VERSION_CODENAME="bookworm" SOURCE_BRANCH_CODENAME="bookworm"
;; ;;
esac esac
;; ;;
@@ -1080,7 +1098,7 @@ function configure_docker_ce_mirror() {
chmod a+r $file_keyring chmod a+r $file_keyring
## 添加源 ## 添加源
[ -d "${Dir_AptAdditionalSources}" ] || mkdir -p $Dir_AptAdditionalSources [ -d "${Dir_AptAdditionalSources}" ] || mkdir -p $Dir_AptAdditionalSources
local source_content="deb [arch=$(dpkg --print-architecture) signed-by=${file_keyring}] ${WEB_PROTOCOL}://${SOURCE}/linux/${SOURCE_BRANCH} ${SYSTEM_VERSION_CODENAME} stable" local source_content="deb [arch=$(dpkg --print-architecture) signed-by=${file_keyring}] ${WEB_PROTOCOL}://${SOURCE}/linux/${SOURCE_BRANCH} ${SOURCE_BRANCH_CODENAME:-"${SYSTEM_VERSION_CODENAME}"} stable"
echo "${source_content}" | tee $File_DockerSourceList >/dev/null 2>&1 echo "${source_content}" | tee $File_DockerSourceList >/dev/null 2>&1
commands+=("apt-get update") commands+=("apt-get update")
;; ;;