diff --git a/ChangeMirrors.sh b/ChangeMirrors.sh index fa0d139..c26b2b3 100755 --- a/ChangeMirrors.sh +++ b/ChangeMirrors.sh @@ -1,6 +1,6 @@ #!/bin/bash ## Author: SuperManito -## Modified: 2024-08-22 +## Modified: 2024-10-07 ## License: MIT ## GitHub: https://github.com/SuperManito/LinuxMirrors ## Website: https://linuxmirrors.cn @@ -153,6 +153,7 @@ SYSTEM_UBUNTU="Ubuntu" SYSTEM_KALI="Kali" SYSTEM_DEEPIN="Deepin" SYSTEM_LINUX_MINT="Linuxmint" +SYSTEM_ZORIN="Zorin" SYSTEM_REDHAT="RedHat" SYSTEM_RHEL="Red Hat Enterprise Linux" SYSTEM_CENTOS="CentOS" @@ -697,7 +698,7 @@ function collect_system_info() { ;; esac ;; - "${SYSTEM_KALI}" | "${SYSTEM_DEEPIN}" | "${SYSTEM_ARCH}" | "${SYSTEM_ALPINE}" | "${SYSTEM_GENTOO}") + "${SYSTEM_KALI}" | "${SYSTEM_DEEPIN}" | "${SYSTEM_ZORIN}" | "${SYSTEM_ARCH}" | "${SYSTEM_ALPINE}" | "${SYSTEM_GENTOO}") # 理论全部支持或不作判断 ;; *) @@ -745,7 +746,7 @@ function collect_system_info() { ;; esac ;; - "${SYSTEM_UBUNTU}") + "${SYSTEM_UBUNTU}" | "${SYSTEM_ZORIN}") if [[ "${DEVICE_ARCH}" == "x86_64" ]] || [[ "${DEVICE_ARCH}" == *i?86* ]]; then SOURCE_BRANCH="ubuntu" else @@ -1650,7 +1651,7 @@ deb ${1} ${2}-security ${3} "${SYSTEM_DEBIAN}") SOURCE="deb.debian.org" ;; - "${SYSTEM_UBUNTU}") + "${SYSTEM_UBUNTU}" | "${SYSTEM_ZORIN}") SOURCE="archive.ubuntu.com" ;; "${SYSTEM_KALI}") @@ -1688,7 +1689,7 @@ $(gen_debian_source "${base_url}" "${SYSTEM_VERSION_CODENAME}" "${repository_sec # deb-src ${base_url} ${SYSTEM_VERSION_CODENAME} ${repository_sections}" >>$File_DebianSourceList fi ;; - "${SYSTEM_UBUNTU}") + "${SYSTEM_UBUNTU}" | "${SYSTEM_ZORIN}") repository_sections="main restricted universe multiverse" echo "${tips} $(gen_ubuntu_source "${base_url}" "${SYSTEM_VERSION_CODENAME}" "${repository_sections}")" >>$File_DebianSourceList diff --git a/DockerInstallation.sh b/DockerInstallation.sh index b59eb8e..5fca78a 100755 --- a/DockerInstallation.sh +++ b/DockerInstallation.sh @@ -1,6 +1,6 @@ #!/bin/bash ## Author: SuperManito -## Modified: 2024-08-22 +## Modified: 2024-10-07 ## License: MIT ## GitHub: https://github.com/SuperManito/LinuxMirrors ## Website: https://linuxmirrors.cn @@ -62,6 +62,7 @@ SYSTEM_UBUNTU="Ubuntu" SYSTEM_KALI="Kali" SYSTEM_DEEPIN="Deepin" SYSTEM_LINUX_MINT="Linuxmint" +SYSTEM_ZORIN="Zorin" SYSTEM_REDHAT="RedHat" SYSTEM_RHEL="Red Hat Enterprise Linux" SYSTEM_CENTOS="CentOS" @@ -340,7 +341,7 @@ function collect_system_info() { "${SYSTEM_DEBIAN}") SOURCE_BRANCH="debian" ;; - "${SYSTEM_UBUNTU}") + "${SYSTEM_UBUNTU}" | "${SYSTEM_ZORIN}") SOURCE_BRANCH="ubuntu" ;; "${SYSTEM_RHEL}") @@ -595,8 +596,8 @@ function uninstall_original_version() { case "${SYSTEM_FACTIONS}" in "${SYSTEM_DEBIAN}") case "${SYSTEM_JUDGMENT}" in - "${SYSTEM_UBUNTU}") - package_list="docker docker-client docker-client-latest docker-common docker-latest docker-latest-logrotate docker-logrotate docker-engine" + "${SYSTEM_UBUNTU}" | "${SYSTEM_ZORIN}") + package_list="docker.io docker-doc docker-compose docker-compose-v2 podman-docker containerd runc" ;; *) package_list="docker.io docker-doc docker-compose podman-docker containerd runc" @@ -642,8 +643,10 @@ function configure_docker_ce_mirror() { apt-key del 9DC8 5822 9FC7 DD38 854A E2D8 8D81 803C 0EBF CD88 >/dev/null 2>&1 # 删除旧的密钥 [ -f $file_keyring ] && rm -rf $file_keyring install -m 0755 -d /etc/apt/keyrings - echo ${SOURCE} - curl -fsSL https://${SOURCE}/linux/${SOURCE_BRANCH}/gpg -o $file_keyring >/dev/null 2>&1 + curl -fsSL https://${SOURCE}/linux/${SOURCE_BRANCH}/gpg -o $file_keyring >/dev/null + if [ $? -ne 0 ]; then + output_error "GPG 密钥下载失败，请检查网络或更换 Docker CE 软件源后重试！" + fi chmod a+r $file_keyring ## 添加源 echo "deb [arch=${SOURCE_ARCH} signed-by=${file_keyring}] https://${SOURCE}/linux/${SOURCE_BRANCH} ${SYSTEM_VERSION_CODENAME} stable" | tee $Dir_DebianExtendSource/docker.list >/dev/null 2>&1 diff --git a/README.md b/README.md index 12b5666..1d5a2eb 100644 --- a/README.md +++ b/README.md @@ -35,7 +35,11 @@ 19.0 ~ 21 / LMDE 6 -  Deepin +  deepin + all + + +  Zorin OS all @@ -100,7 +104,7 @@ *** -这是一个完全开源的非盈利项目，旨在为从事计算机相关行业的朋友们提供便利，让换源更简单 +这是一个完全开源的非盈利项目，旨在为从事计算机相关行业的朋友们提供便利，使换源更简单 ### LICENSE diff --git a/docs/assets/images/icon/deepin.png b/docs/assets/images/icon/deepin.png new file mode 100644 index 0000000..fdf9070 Binary files /dev/null and b/docs/assets/images/icon/deepin.png differ diff --git a/docs/assets/images/icon/zorin-os.png b/docs/assets/images/icon/zorin-os.png new file mode 100644 index 0000000..ebc72b1 Binary files /dev/null and b/docs/assets/images/icon/zorin-os.png differ diff --git a/docs/index.md b/docs/index.md index 6810f4f..2a9174c 100644 --- a/docs/index.md +++ b/docs/index.md @@ -69,14 +69,15 @@ hide: | Ubuntu :material-information-outline:{ title="支持乌班图家族衍生操作系统，例如 优麒麟 Kubuntu 等
此外由于迭代速度较快并不直接支持所有非长期支持(LTS)的版本，具体详见使用文档中的高级用法" } | 14.04 ~ 24 | | Kali Linux | 2.0 ~ 2024 | | Linux Mint | 19.0 ~ 21 / LMDE 6 | -| Deepin | all | +| Deepin | all | +| Zorin OS | all | | Armbian | all | | Proxmox | all | | Red Hat Enterprise Linux :material-information-outline:{ title="使用 CentOS Stream 或 CentOS 源" } | 7.0 ~ 9 | | Fedora | 30 ~ 40 | | CentOS | 7.0 ~ 8.5 / Stream 8 ~ 9 | | Rocky Linux | 8 ~ 9 | -| AlmaLinux | 8 ~ 9 | +| AlmaLinux | 8 ~ 9 | | OpenCloudOS | 8 ~ 9 | | openEuler | 21.03 ~ 24 | | openSUSE | Leep 15 / Tumbleweed | diff --git a/docs/other/index.md b/docs/other/index.md index 82fe82a..a1be899 100644 --- a/docs/other/index.md +++ b/docs/other/index.md @@ -28,17 +28,20 @@ hide: Rocky Linux - Deepin - AlmaLinux + Deepin + AlmaLinux - Armbian + Zorin OS OpenCloudOS - Proxmox + Armbian openEuler + + Proxmox + ``` bash diff --git a/docs/use/command-options.md b/docs/use/command-options.md index e04ab19..e32e3d8 100644 --- a/docs/use/command-options.md +++ b/docs/use/command-options.md @@ -53,14 +53,15 @@ bash <(curl -sSL https://linuxmirrors.cn/main.sh) \ | Ubuntu | ubuntu / ubuntu-ports | | Kali Linux | kali | | Linux Mint | linuxmint / ubuntu / ubuntu-ports / debian | - | Deepin | deepin | + | Deepin | deepin | + | Zorin OS | ubuntu / ubuntu-ports | | Armbian | armbian | | Proxmox | proxmox | | Red Hat Enterprise Linux :material-information-outline:{ title="9版本使用 CentOS Stream， 7、8版本使用CentOS" } | centos / centos-stream / centos-altarch / centos-vault | | Fedora | fedora | | CentOS | centos / centos-stream / centos-altarch / centos-vault | | Rocky Linux | rocky | - | AlmaLinux | almalinux / almalinux-vault | + | AlmaLinux | almalinux / almalinux-vault | | OpenCloudOS | opencloudos | | openEuler | openeuler | | openSUSE | opensuse | diff --git a/docs/use/help.md b/docs/use/help.md index 27888d9..117b45a 100644 --- a/docs/use/help.md +++ b/docs/use/help.md @@ -8,7 +8,7 @@ apt-get install -y curl ``` - > `Debian`   `Ubuntu`   `Kali`   `Linux Mint`   `Deepin`   `Armbian`   `Proxmox` + > `Debian`   `Ubuntu`   `Kali`   `Linux Mint`   `Deepin`   `Zorin OS`   `Armbian`   `Proxmox` 新装系统需要先执行一遍更新 `apt-get update` @@ -86,7 +86,7 @@ apt-get update ``` - > `Debian`   `Ubuntu`   `Kali`   `Linux Mint`   `Deepin`   `Armbian`   `Proxmox` + > `Debian`   `Ubuntu`   `Kali`   `Linux Mint`   `Deepin`   `Zorin OS`   `Armbian`   `Proxmox` === "RedHat 系 / OpenCloudOS / openEuler" diff --git a/docs/use/index.md b/docs/use/index.md index 0d050cb..e072261 100644 --- a/docs/use/index.md +++ b/docs/use/index.md @@ -109,7 +109,7 @@ hide: 默认禁用了`deb-src`源码仓库和`proposed`预发布软件源，若需启用请将 `/etc/apt/sources.list` 文件中相关内容的所在行取消注释 - > `Debian`   `Ubuntu`   `Kali`   `Linux Mint`   `Deepin`   `Armbian`   `Proxmox` + > `Debian`   `Ubuntu`   `Kali`   `Linux Mint`   `Deepin`   `Zorin OS`   `Armbian`   `Proxmox` === "RedHat 系 / OpenCloudOS / openEuler" diff --git a/requirements.txt b/requirements.txt index 290304e..774db60 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,3 +1,3 @@ -mkdocs-material==9.5.32 +mkdocs-material==9.5.39 mkdocs-glightbox==0.4.0 mkdocs-exclude-search==0.6.6 \ No newline at end of file