From faade5827b6ee5d35ce622859a9bca5a1766217a Mon Sep 17 00:00:00 2001 From: SuperManito <68613938+SuperManito@users.noreply.github.com> Date: Mon, 7 Oct 2024 08:17:16 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=80=82=E9=85=8D=20Zorin=20?= =?UTF-8?q?OS=20=E6=93=8D=E4=BD=9C=E7=B3=BB=E7=BB=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ChangeMirrors.sh | 11 ++++++----- DockerInstallation.sh | 15 +++++++++------ README.md | 8 ++++++-- docs/assets/images/icon/deepin.png | Bin 0 -> 9188 bytes docs/assets/images/icon/zorin-os.png | Bin 0 -> 2585 bytes docs/index.md | 5 +++-- docs/other/index.md | 11 +++++++---- docs/use/command-options.md | 5 +++-- docs/use/help.md | 4 ++-- docs/use/index.md | 2 +- requirements.txt | 2 +- 11 files changed, 38 insertions(+), 25 deletions(-) create mode 100644 docs/assets/images/icon/deepin.png create mode 100644 docs/assets/images/icon/zorin-os.png 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 @@
Ab75Fhgw=+ef!MRS`=LAKn+Kt4v!n1`s4+n%Z?cnZ #m>Wdm#Vpo{byip4`hoErvDUp6K_7MdNpRmzW}+yd6z1P2CwZ&T zmH-2F!ol@?N>5Rz4DG04qJ|>;JamBr)uDG1G0igI>TbfZg$Z+-Xxs|EI)Fr@eO4+e zj)KSx2F5}e%3wQMN5c;2cN2uRL!tBVf>ibSot%z-;{TmzJ2W(U z-jDC+fQbTFQGDgFwxz)HFd|u>`O8#kWF-nKK-tGw_MNC0 tc2EX1P7`(*~2$~Vd-^A@csJ=yyqZ}t1q$p z*SD 9`=p$E1vK7r(`fJ*~pS~o+>l0aTdE)exO+s_>26wL3N;8>mj z6Tk?{<^8#7E1LpS^pR`*Q^%L?u0(Et{=v_&uwLRcJcisaOBhXN) t8NlW8^i^|eZy@g!@I;K4wPNiRXXp20&CxeK+&Jljz4yO@ z*#FC@6pBy a5TB{j=Bv-5X*UT|F0eJt6kY997Cr7q{(}>#}ZUex7(KVfEen0;^ z12|OsgHKKy-d&UiU-LKv-v=|0dPS!g_@`wvT4(!PRp58R$4UBAj%HN0^)ovyTL9D` zFo5rh$O*#!*BZruq-dI`a*k-OLJLkKc@^pb>Q7_;g9bdj{R|ayoZevd-`^jnjSW`x zR?ZSu)i;s=>9P6;X5Khj+vJ4|5#%IrlCGNngqH6tDb!*qL#;8UX~n^VM064MW3_wM z?{6KgT#4TfcHZbfD)8Q`k;(himuKm3F#C+$%w4gPXR+C;1AETYQ#Gs*bsNc=A>*b- z_?=##6$lw`H5f~f(@kldqU6s3EeCsB8Nh=J9aSr@N4#@7fOjA)1@44dXlKvYD!avC z(s=9o@s@J>sM*$L|NC!tRnpR(m8ShJ9N1Y``QtHc)Ce#!eyro@K?;YH4J@Dy$3u6h zR;HnU-z_O(t>Hn5FLi7cMaedjF6?sYqCrXY*0I_qQz}5%iV!OkRx4CH1g6&~2nK!o z-BRLloQG?eQ^L%kKm7i4VXYX!TgRFmN2)?u2B(zd^fQC*KL)O$1eQRjeKM1Tmc-6h z2_WC%4K$h`t+XkpknD*SIv@LNFjC+meDNDgv{%lJav-E><2wzLuuhQ*uD24|YIy3# zZiajR9w>kNSZmi<&Ak&%j*uBhfCA_ @yP@=be*h$s0USdF zZ_S|^%{B)o#~4ZuW^yxJ@ PS 6|!H;18JmBvr`N&bILKzO$NAAO*Jfqc`9Svj$ttLMWrp-JE8;dNIoFWfy4OVLnrc zInsD0>G&MH6I9BsYm=>xB}~XbUIZ%onr#6_TC0 c7^@aNZeZHhrC+8GG{_*+wZ(8FL5BZm)H qE5kS?@r2Y-9nKD?ZNmZo9PAKBeMbNR>D zb)lIs?RXXQmN5YPbwBtbtipe7J52?Z`u_Uax#m~Y9_E81yaEm2bO;%s(R<)UqyJVV zP_@#^!hF>EXIQDza$tj-tQ5WX54>MW6@0c&1JdCP`Bv`)n$b7W7V+OIsG;ZfAbUp# zCqA1$>uPfb*ahY@9#@liW)EX1pzNH+O(^Ou0AH~zR4Rh?4WU8CXn@a*PopU~TW6** zYrQYUAm^?xam=s2t@J$o@Pjf#T;{-+k%+`sBRG8aqRg1aV`>r*)f$PVPB4U=9j#CS zAP5V+?Y2k&7d}g( lX?Ra7j|jm&laSz>{jkio$%lmB%MD!9->P z&1+9gwduE@t>3w}h)xB#r>;Q2Xxf^>X73>o(qY73j!ZFK{XCuxM~w3heA*9?z(&<% z8mh*CKcUq&K`R5`OX%u?rM2Nb-s~d@CS_oM4J?0P`-wUl|JqS{@2K@ydp dh6u3I`3#R5{@g;N0M z#4z@&w*jyu_@D9Vl#Y`*e}E=#7g+I`1u;IpXFPp>a2Fbiam1*SLRslzCRuy1n%;+3 z(F(AC;aO}`R$wKplO|@eQkp1E<0=|!HT6r$7L2-oNh Cv~S`-K~9>aK&DDC{2=Am3Sm`)=&uGupGVgZP+ae2fe?v z=m2qbaR AE!EgO`DrjaKU9B1D{bPd44uQ$I~iJ&fOPJ=L`OZJ4rsY CJ2``ThUkK7Hzwmp$PxHp zP7d{h``9Y*eEnq?T-r7z61%9K2AOs$CPaL6o3bC@vr-;$o4Ufsh1RrVr;)eP-i-d8 z>9c?9ORwB<6^+Q`lSim!>CrdyIDKpOHA!;2|2aC%&vG!ri$(u^ZyYC&&Sg_ZOmQts zG>75iLXC5eOk)N3XdWJcHoH|C<7Uo*YsbLm;;p?C<%dPy+OMkU!=p8{3wd@{a}HzS z)f;(LJlaU0+jHUG4Zt4fKob+c*eG3HXC5<=P8JF)U^APxDg}^ftVF}_)~7B@_Z&un zmb`H;{K 095 zIzp4iSYaFlvC2=V;gR=F& 1DfpksU!TcMhcGHq4h#{d;# z^=2r*XOzm+J{-bek#YrEXP^S+)m^V1p;vb!8_AO5iMkr)#`Q{o3)tBh0Mm+TrtFVt z%Ct3Q09rD(5$RKYQsA|{+G$t+icIk-wCgc{-cOsMYzC6MpsX` +5%{Mqr|jZ$*_Zzmevn(9+fVnc zK1yYBcCT@+fYtZxaGH00vg7k3(@2G*OiLZmWq=5`_%a%*S2ng6i571l5C7{9tlh82 zO1ky=12px;gS1Od>d;o=0{#7aHzZRxhfiNKvoeiTIMvIv)B(fmzmp#M{3WzDPhB?w zp0b kBI?m)@ZJJz--ET;ejxLw*cUjV#yKp=j{Kz^+qfgdv&nGz2;R*QUo&yh*lfdyyhV z@Di?v&HU!RO4@!rJaLbQZcKBW_@BZe*`kpGCy2DnXs%5^0MPm2?Q7A1-zCFl1k6q8 zK>boX&>$pG JYKxr?~m3^cKt0(EbZ1 z;F5;l-=5_-qDv8lEb|XR*CW4kiIvVQeSD|tx5N3^*fO)ghVFZZY-g)Bc6%)M$LYPO zyXs3NRtRKNX6Ny9^p`Dso=0^71xd@8W>(s_BmuagPO ET!$Z!qu@y|)eHnc* zH*a`1nu?gelfa_?fmKJ~w)abwFYFX|ajDh#ttB16i+I9MwobsgGQXIzlLPy@wKV`H z@%uk=Uh7}D<|wWBtmTAP%e0AtFtO%|5${@^M@w6Pw=ub4oOcM+`(?eJGw#;5-U?FS z>09-^T*tNke?aSBv9-+KEiFnb>=2*nYIzH2<)}*wNs1hEWh*dVV{Eys{7x?Ree0J| zSXs4)U|K)43I}_ U_K{J*OD 1 z5j(LVwS0jhP()hlwE@wB#u*K;*nbgw{?tLvihaiI=g|1ygyQE9!htBUaYius2PFZx z oXp=yI$ZhsftM_hQcv3Gt86@{K37rsX8L8^2lo^i4;CnX{l7 zfIIKF;Ny|5rkwMZTd0FU>T;@^g1E)Y_w}RU+15@D+Zo%>S2OWjF7r@UtraEL#B 7lV}iC*815L-jh?=@kK>6iRXA^O&+>fQa!Ave z+b9Uq% 7Hlu zVdraJ%+ZJ|d}dZZ?;P MW`eJkPB0)No}T?qKe`5~Z%)ISou}wW zuN NR^3d~oNv7slE4@>#*t+0m$aOq~B=Hf|ky8*;`uKY^7|*)3zB zN?e T8#<#pYybcQ zib+I4RO2t!ORM25vhOhrK*tN9ist+z;?}MucV^R^8`DFw>VLiVC_VoX?l#u@aF!tC z#l#3RPCqj?q^Zgwl>o|_ji2}7V^Crqg*0f_W}+J+e*R4v^zhVPNP=-5)m2+h(&9A* zRElI(O^~P&O7wr#uDHokN|#+>r!F5h29WiFx$lj{?X-MIF)LWaovzP>zk7Hp{q(jh z%I@a;r4pYUI7^SLI!t?f4sNLBl~9Nb%-QE&z9l64z1EzCl>r!mPV+W)@<^U1k*qP# zX(9&FUJK!G?-?4x?>|ewS$C8^1p^p@Agpi;?uAt=##+th3S_u`b;8a7UJT;yeSZS3 zqQRj>e6KL%;IA3P#YE7Y(djh*=1j*4Uymzo-`-VDPrY*-D<0n(GKNBtgavi~H{KD? zo>^yYx&` {6>vo)?FN>^QsfQ%)6_JtBlByMxu;;fev ;a5Zh*S3w)|E2;R5$=yl5 zyU#kwEiJBFIdN~>lD)O}cEtc*wBo;=*B@sc7QvGk&}pQUM0}wf8ht;wZu=l&*B#Ni zt85-&XF{LA*}_A(Z22&rgLrlpR8!?S+qaF^g9lb&EX!(No4BvN5Z;SNyJUbCi7;b* zs>|)3i=z( |l_cJ-~BooO<(tz0$? z&@v5UHb%sy){n+{xM?m?VE3}mwYH(1F3r{pa1b+35QKGgCu26#CjYD0+5jiZU0!|+ zpc-1t%ney?kwy!mGz?;Q7+w#+ zm_JTBT?zpCvudCSz+D0ta3 zfZv$lTZpSWpDU2i7rH|Z7=tB522vk5EY07d)7K@M8Y{%Z0T|x5OF-xXoS!Rz>2|O# uF7`lM+U&s)`bym^GjL@FuFQb{4E#R_9v^r~-;MeJ0000 zaB^>EX>4U6ba`-PAZ2)IW&i+q+U-|ck|QY${O1&VgpvdZj>Ah4dxJgxCKO$^+wSSd z%;&hm1qLArr4VU1{`=S5KlpG+?0nD^bBqT*KKslCophX^yxw&9^ O zkf4?Gr QChMb zIPx4uZ2}NMBFwPe}Kh1y2->G=j~v{B=Q)RfZ; zHH 7z94$wX0_5!s&@42=RJ5S+^=^;3Mm>;P)PGw$dWwln0vAR~H zm;kmlbKF|2n%z1O&YYT+2CEgWyI>_-%vmvIK?a;Crd54~&nDX2X=RXfepY-LaPXlH zZ7@>nq0>f1q$`5cYsuJdq^#Ca4YiLNigkF T+q(_8C46ZkMFmp`-9ylcQ5xnbt9 zWlK7JLMmvh7S3gm!c==i_NJ%gMnlAnDy@&vOOK;yLw2v=VyiQ_eIU3UsoA>e)?2;F zbJ*PbfuFW+fdiBVw-`l6>8--SVG0L}?EGpgzj~bcg(;KJw^Npp2HjsCeV)^ww66RN zwx?WkzwOFy-NS${hsRyz1NcV!UcB8y;=|q3!xj3&W^N$3p>!0OGxU-6(T?+Ihjp|W zN86osVJ{~eE!tQ~N%MVp^VK?ZTG3gXY!#*Rl%HpIFLAb3csZr9!&CmX^qm2Dr`~PwX>Dg7TtP^X;6W(@`~7zUO&eG{PYM_?@SI zCVU4Sz@;K9+d&Yf{4Ab#@*jzdd!_v+%H1pNzfwL6&P5ZNO_~sKT@`oZ3E#fTKCF &hWQ3 Ubuntu :material-information-outline:{ title="支持乌班图家族衍生操作系统,例如gl73$o;PAqSlXOO?%1;S5MBfh-5hNoQu%-jNv{ zv>H<_o8Dd8AsJZh Ywfg_lFMuJ4H8tR)<8gRa(^4 zip;xik=4BD>qeC3)Dszfoor7jakG{6Bnid!#S$h#Lr_aRg9~~-gA4M|BSMeh>dvB? zzy{JU3)@0(3{cdQh4jTjBJ}6F^GjBKfrZ#)A#t&gy}{y=fWmw=r%`2k24VOgTFWh8 zAIz8Y0001SdQ@0+Qek%>aB^>EX>4U6ba`-PAZc)PV*mhn+C59L4Ztu6+qt4AfK8J2 zoG8uEtwaA;2}6u*Y-HqlzadAWs_=C9<+pmw2Gxe5&SeX{dRv(-awn)k!yUV&nhjCp zr_r-I!cQ8>9z + R|HHKWNgBq_{W=t_25w7OM^}&bm6d z3WDGdh?|>}qKlMxUs7lh +7C+sqW%D%fIi>>QnO;0|FxPEHg}-c!PL)(>6Ho6GvD{R*BDv$4t5) z@gvt2kKZ^KT^4v|#LT4Ui6g{fv4fQkW+hW2o+6H^nojvb)?=0P7H6$eW37Ag7l!lt z$}-n!4Izm|EJ1<@1vQjWfsHurIw=;?be{0>54wJdTnf3$VB}ap6&hsM5B>+gXKNKE zC%mL^0_c8moR483v ZGW`^%zTnwZ)>q5pnn^ zM4t@VlwB!EODGh8_cQvY958ST^saexYn|it0m#s-Qa8ZCAuv*;>~)`a_jJzf-=5a| zegH+ka+P4ht{(sZ00v@9M??Vs0RI60puMM)00009a7bBm000XU000XU0RWnu7ytkO z2XskIMF-^v0Sq8CJ?pZU0005lNkl %oOF@Viaz6xRS#71=xvqq{W>XOICCUrCK68QvE{}^eF-5*20;d8XA zN2*FNj9KhxxWSLugCCV82q !`MI+|P&lV*xkGr||IULVw`7$8o zR2Fw0>uV}`d!_zGJ}`n8xQ~Ze3XIewZem;H*nh@Od|NX{)N8vyQ`>H=z;eP+zdHq@ z{|&n&Uv(raP+~0W*3p(6-!tP{C@NiA(XrP%*yOcA@|b(UFlMsRX@Ys|ZF4AH 优麒麟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
CentOS Stream, 7、8版本使用CentOS" } | centos / centos-stream / centos-altarch / centos-vault |
|