From 4bd2ccee8dec2b9e34388d583ee28ca429d199d1 Mon Sep 17 00:00:00 2001 From: Super Manito <68613938+SuperManito@users.noreply.github.com> Date: Tue, 8 Feb 2022 10:04:50 +0800 Subject: [PATCH] Update --- ChangeMirrors.sh | 24 ++++++++++++------------ DockerInstallation.sh | 22 +++++++++++----------- docs/.DS_Store | Bin 6148 -> 0 bytes docs/img/.DS_Store | Bin 6148 -> 0 bytes 4 files changed, 23 insertions(+), 23 deletions(-) delete mode 100644 docs/.DS_Store delete mode 100644 docs/img/.DS_Store diff --git a/ChangeMirrors.sh b/ChangeMirrors.sh index a9b1d0f..d7329e2 100644 --- a/ChangeMirrors.sh +++ b/ChangeMirrors.sh @@ -1,9 +1,9 @@ #!/bin/bash ## Author: SuperManito -## Modified: 2021-12-15 +## Modified: 2022-02-07 ## License: GPL-2.0 -## Github Repository: https://github.com/SuperManito/LinuxMirrors -## Gitee Repository: https://gitee.com/SuperManito/LinuxMirrors +## Github: https://github.com/SuperManito/LinuxMirrors +## Gitee: https://gitee.com/SuperManito/LinuxMirrors function AuthorSignature() { echo -e "\n${GREEN} ------------ 脚本执行结束 ------------ ${PLAIN}\n" @@ -164,7 +164,7 @@ function PermissionJudgment() { function TurnOffFirewall() { systemctl status firewalld | grep running -q if [ $? -eq 0 ]; then - CHOICE_C=$(echo -e "\n${BOLD}└ 是否关闭防火墙和 SELINUX [ Y/n ]：${PLAIN}") + CHOICE_C=$(echo -e "\n${BOLD}└ 是否关闭防火墙和 SELINUX? [Y/n] ${PLAIN}") read -p "${CHOICE_C}" INPUT [ -z ${INPUT} ] && INPUT=Y case $INPUT in @@ -202,7 +202,7 @@ function BackupMirrors() { ## /etc/apt/sources.list if [ -s $DebianSourceList ]; then if [ -s $DebianSourceListBackup ]; then - CHOICE_BACKUP1=$(echo -e "\n${BOLD}└ 检测到系统存在已备份的 list 源文件，是否覆盖备份 [ Y/n ]：${PLAIN}") + CHOICE_BACKUP1=$(echo -e "\n${BOLD}└ 检测到系统存在已备份的 list 源文件，是否覆盖备份? [Y/n] ${PLAIN}") read -p "${CHOICE_BACKUP1}" INPUT [ -z ${INPUT} ] && INPUT=Y case $INPUT in @@ -227,7 +227,7 @@ function BackupMirrors() { ## /etc/apt/sources.list.d if [ -d $DebianExtendListDir ] && [ ${VERIFICATION_FILES} -eq 0 ]; then if [ -d $DebianExtendListDirBackup ] && [ ${VERIFICATION_BACKUPFILES} -eq 0 ]; then - CHOICE_BACKUP2=$(echo -e "\n${BOLD}└ 检测到系统存在已备份的 list 第三方源文件，是否覆盖备份 [ Y/n ]：${PLAIN}") + CHOICE_BACKUP2=$(echo -e "\n${BOLD}└ 检测到系统存在已备份的 list 第三方源文件，是否覆盖备份? [Y/n] ${PLAIN}") read -p "${CHOICE_BACKUP2}" INPUT [ -z ${INPUT} ] && INPUT=Y case $INPUT in @@ -250,7 +250,7 @@ function BackupMirrors() { ## /etc/yum.repos.d if [ ${VERIFICATION_FILES} -eq 0 ]; then if [ -d $RedHatReposDirBackup ] && [ ${VERIFICATION_BACKUPFILES} -eq 0 ]; then - CHOICE_BACKUP3=$(echo -e "\n${BOLD}└ 检测到系统存在已备份的 repo 源文件，是否覆盖备份 [ Y/n ]：${PLAIN}") + CHOICE_BACKUP3=$(echo -e "\n${BOLD}└ 检测到系统存在已备份的 repo 源文件，是否覆盖备份? [Y/n] ${PLAIN}") read -p "${CHOICE_BACKUP3}" INPUT [ -z ${INPUT} ] && INPUT=Y case $INPUT in @@ -321,7 +321,7 @@ function ChangeMirrors() { ## 更新软件包 function UpgradeSoftware() { - CHOICE_B=$(echo -e "\n${BOLD}└ 是否更新软件包 [ Y/n ]：${PLAIN}") + CHOICE_B=$(echo -e "\n${BOLD}└ 是否更新软件包? [Y/n] ${PLAIN}") read -p "${CHOICE_B}" INPUT [ -z ${INPUT} ] && INPUT=Y case $INPUT in @@ -335,7 +335,7 @@ function UpgradeSoftware() { yum update -y ;; esac - CHOICE_C=$(echo -e "\n${BOLD}└ 是否清理已下载的软件包缓存 [ Y/n ]：${PLAIN}") + CHOICE_C=$(echo -e "\n${BOLD}└ 是否清理已下载的软件包缓存? [Y/n] ${PLAIN}") read -p "${CHOICE_C}" INPUT [ -z ${INPUT} ] && INPUT=Y case $INPUT in @@ -570,9 +570,9 @@ function ChooseMirrors() { VERIFICATION_EPELBACKUPFILES=$? if [ ${VERIFICATION_EPEL} -eq 0 ]; then - CHOICE_D=$(echo -e "\n${BOLD}└ 检测到系统已安装 EPEL 扩展源，是否替换/覆盖为国内源 [ Y/n ]：${PLAIN}") + CHOICE_D=$(echo -e "\n${BOLD}└ 检测到系统已安装 EPEL 扩展源，是否替换/覆盖为国内源? [Y/n] ${PLAIN}") else - CHOICE_D=$(echo -e "\n${BOLD}└ 是否安装 EPEL 扩展源 [ Y/n ]：${PLAIN}") + CHOICE_D=$(echo -e "\n${BOLD}└ 是否安装 EPEL 扩展源? [Y/n] ${PLAIN}") fi read -p "${CHOICE_D}" INPUT [ -z ${INPUT} ] && INPUT=Y @@ -591,7 +591,7 @@ function ChooseMirrors() { fi ## 选择同步软件源所使用的 WEB 协议（ HTTP：80 端口，HTTPS：443 端口） - CHOICE_E=$(echo -e "\n${BOLD}└ 软件源是否使用 HTTP 协议 [ Y/n ]：${PLAIN}") + CHOICE_E=$(echo -e "\n${BOLD}└ 软件源是否使用 HTTP 协议? [Y/n] ${PLAIN}") read -p "${CHOICE_E}" INPUT [ -z ${INPUT} ] && INPUT=Y case $INPUT in diff --git a/DockerInstallation.sh b/DockerInstallation.sh index e616580..bedaeac 100644 --- a/DockerInstallation.sh +++ b/DockerInstallation.sh @@ -1,9 +1,9 @@ #!/bin/bash ## Author: SuperManito -## Modified: 2021-12-15 +## Modified: 2022-02-07 ## License: GPL-2.0 -## Github Repository: https://github.com/SuperManito/LinuxMirrors -## Gitee Repository: https://gitee.com/SuperManito/LinuxMirrors +## Github: https://github.com/SuperManito/LinuxMirrors +## Gitee: https://gitee.com/SuperManito/LinuxMirrors function AuthorSignature() { echo -e "\n${GREEN} ------------ 脚本执行结束 ------------ ${PLAIN}\n" @@ -307,13 +307,13 @@ function DockerEngine() { AuthorSignature exit else - CHOICE_E=$(echo -e "\n${BOLD}└ 检测到已安装最新版本的 Docker Engine，是否继续安装其它版本 [ Y/n ]：${PLAIN}") + CHOICE_E=$(echo -e "\n${BOLD}└ 检测到已安装最新版本的 Docker Engine，是否继续安装其它版本? [Y/n] ${PLAIN}") fi else if [[ ${DOCKER_VERSION_INSTALL_LATEST} == "True" ]]; then - CHOICE_E=$(echo -e "\n${BOLD}└ 检测到已安装旧版本的 Docker Engine，是否覆盖安装为最新版本 [ Y/n ]：${PLAIN}") + CHOICE_E=$(echo -e "\n${BOLD}└ 检测到已安装旧版本的 Docker Engine，是否覆盖安装为最新版本? [Y/n] ${PLAIN}") else - CHOICE_E=$(echo -e "\n${BOLD}└ 检测到已安装旧版本的 Docker Engine，是否继续安装其它版本 [ Y/n ]：${PLAIN}") + CHOICE_E=$(echo -e "\n${BOLD}└ 检测到已安装旧版本的 Docker Engine，是否继续安装其它版本? [Y/n] ${PLAIN}") fi fi read -p "${CHOICE_E}" INPUT @@ -404,7 +404,7 @@ function ConfigureImageAccelerator() { if [[ ${REGISTRY_SOURCE_OFFICIAL} == "False" ]]; then if [ -d $DockerDir ] && [ -e $DockerConfig ]; then if [ -e $DockerConfigBackup ]; then - CHOICE_BACKUP=$(echo -e "\n${BOLD}└ 检测到已备份的 Docker 配置文件，是否覆盖备份 [ Y/n ]：${PLAIN}") + CHOICE_BACKUP=$(echo -e "\n${BOLD}└ 检测到已备份的 Docker 配置文件，是否覆盖备份? [Y/n] ${PLAIN}") read -p "${CHOICE_BACKUP}" INPUT [ -z ${INPUT} ] && INPUT=Y case $INPUT in @@ -585,7 +585,7 @@ function ChooseMirrors() { ;; esac ## 是否手动选择安装版本 - CHOICE_C=$(echo -e "\n${BOLD} └ 是否安装最新版本的 Docker Engine [ Y/n ]：${PLAIN}") + CHOICE_C=$(echo -e "\n${BOLD} └ 是否安装最新版本的 Docker Engine? [Y/n] ${PLAIN}") read -p "${CHOICE_C}" INPUT [ -z ${INPUT} ] && INPUT=Y case $INPUT in @@ -662,16 +662,16 @@ function ChooseMirrors() { ;; esac if [ -x $DockerCompose ]; then - CHOICE_D=$(echo -e "\n${BOLD}└ 检测到已安装 Docker Compose ，是否覆盖安装 [ Y/n ]：${PLAIN}") + CHOICE_D=$(echo -e "\n${BOLD}└ 检测到已安装 Docker Compose ，是否覆盖安装? [Y/n] ${PLAIN}") else - CHOICE_D=$(echo -e "\n${BOLD}└ 是否安装 Docker Compose [ Y/n ]：${PLAIN}") + CHOICE_D=$(echo -e "\n${BOLD}└ 是否安装 Docker Compose? [Y/n] ${PLAIN}") fi read -p "${CHOICE_D}" INPUT [ -z ${INPUT} ] && INPUT=Y case $INPUT in [Yy] | [Yy][Ee][Ss]) DOCKER_COMPOSE="True" - CHOICE_D1=$(echo -e "\n${BOLD} └ 是否使用国内代理进行下载 [ Y/n ]：${PLAIN}") + CHOICE_D1=$(echo -e "\n${BOLD} └ 是否使用国内代理进行下载? [Y/n] ${PLAIN}") read -p "${CHOICE_D1}" INPUT [ -z ${INPUT} ] && INPUT=Y case $INPUT in diff --git a/docs/.DS_Store b/docs/.DS_Store deleted file mode 100644 index b1f500a9fddcd2cc3caefbe2d7ae2a6601d996e3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeHKOHRWu5Pg$YY70W@k_}Q$P=Uk&Le(x>rZBQvH6j4Adv*!+6f%CC~Hy%?p zN!eC_W~A}+XPzCuSeY1r^q=wrpbMZ)S4=uA)|if~*DQ%WEuw@udbmY?Je!Y4vs$!w z{6+=z-L-IzL+sO6-rs!05j_@1^xkJM)_@&Gk1@wHuJC|+Tw=o7I_7(Y*&uI$g`JP@ z`DL#bHRUOql%v8^ysbRN7N)pE&Xr%d_B9^KnUy*6TA4Y)O>Om$N=yf*7;?1%PKaxE zl}suOHr-qSSHKncV+t^5tF^Zcy>ta!0aswDfPNoRx?&cwFbtm#7U2p&Y_dBT>-y8E zoHSwCaX7@hrTjLRYxhDL|P%ZJ33CEidZtj_t<5Dv)ta!fwBS( zYj!pN4}ZS@mr34o1zdrDrGPXCXM;Ys6mx5BbDC>Y`UPE0;|jwig_V$s8LO#ymmZA$ XsaA+t#KMq0H2)C@GI-$%Y*c|SvPxt> diff --git a/docs/img/.DS_Store b/docs/img/.DS_Store deleted file mode 100644 index 72bd491babaff841b7dd705d472268fb947183f2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeHK!A`?440T4O6>*uwg$q)?U}6#R2uKj9Pj0N})j@G07Y8l1cPTflkJ#=$5WmbtsE^ z6m5>*$N=x%l+Ni4I;X+@g#tbNTU66|qFfwsEOeca=|xVl=b%h0rvO;4-g z7){9YqLwkz9$2RNGo(z!=yuaG>Ul>;L8c z_x~=zEMveJ_;U=nBwy!CEGyR5(E_>Fdgv9Dh2uKKJ_Ux9V#IPOK7oqB@7Vxm5j#bA PAa)TD8mut}ew2X^CvQ(g