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

优化

Browse Source
This commit is contained in:
Super Manito
2025-03-20 10:18:12 +08:00
parent 19eb9ef4e7
commit a2f2527917
2 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
ChangeMirrors.sh
View File

@@ -1,6 +1,6 @@
#!/bin/bash #!/bin/bash
## Author: SuperManito ## Author: SuperManito
## Modified: 2025-03-16 ## Modified: 2025-03-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
@@ -676,7 +676,7 @@ function collect_system_info() {
## 判定系统类型、版本、版本号 ## 判定系统类型、版本、版本号
case "${SYSTEM_FACTIONS}" in case "${SYSTEM_FACTIONS}" in
"${SYSTEM_DEBIAN}" | "${SYSTEM_OPENKYLIN}") "${SYSTEM_DEBIAN}" | "${SYSTEM_OPENKYLIN}")
if [ ! -x /usr/bin/lsb_release ]; then if ! command -v lsb_release &>/dev/null; then
apt-get install -y lsb-release apt-get install -y lsb-release
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
output_error "lsb-release 软件包安装失败\n\n本脚本依赖 lsb_release 指令判断系统具体类型和版本，当前系统可能为精简安装，请自行安装后重新执行脚本！" output_error "lsb-release 软件包安装失败\n\n本脚本依赖 lsb_release 指令判断系统具体类型和版本，当前系统可能为精简安装，请自行安装后重新执行脚本！"
@@ -910,7 +910,7 @@ function collect_system_info() {
esac esac
## 判断是否可以使用高级交互式选择器 ## 判断是否可以使用高级交互式选择器
CAN_USE_ADVANCED_INTERACTIVE_SELECTION="false" CAN_USE_ADVANCED_INTERACTIVE_SELECTION="false"
if [ ! -z "$(command -v tput)" ]; then if command -v tput &>/dev/null; then
CAN_USE_ADVANCED_INTERACTIVE_SELECTION="true" CAN_USE_ADVANCED_INTERACTIVE_SELECTION="true"
fi fi
} }
@@ -972,7 +972,7 @@ function choose_mirrors() {
for ((a = 0; a < $list_arr_sum; a++)); do for ((a = 0; a < $list_arr_sum; a++)); do
list_arr[$a]="$(eval echo \${$1[a]})" list_arr[$a]="$(eval echo \${$1[a]})"
done done
if [ -x /usr/bin/printf ]; then if command -v printf &>/dev/null; then
for ((i = 0; i < ${#list_arr[@]}; i++)); do for ((i = 0; i < ${#list_arr[@]}; i++)); do
tmp_mirror_name=$(echo "${list_arr[i]}" | awk -F '@' '{print$1}') # 软件源名称 tmp_mirror_name=$(echo "${list_arr[i]}" | awk -F '@' '{print$1}') # 软件源名称
# tmp_mirror_url=$(echo "${list_arr[i]}" | awk -F '@' '{print$2}') # 软件源地址 # tmp_mirror_url=$(echo "${list_arr[i]}" | awk -F '@' '{print$2}') # 软件源地址
@@ -1532,7 +1532,7 @@ function change_mirrors_main() {
done done
} }
if [[ -x /usr/bin/diff && "${BACKED_UP}" == "true" ]]; then if command -v diff &>/dev/null && [[ "${BACKED_UP}" == "true" ]]; then
case "${SYSTEM_FACTIONS}" in case "${SYSTEM_FACTIONS}" in
"${SYSTEM_DEBIAN}" | "${SYSTEM_OPENKYLIN}") "${SYSTEM_DEBIAN}" | "${SYSTEM_OPENKYLIN}")
if [[ "${SYSTEM_JUDGMENT}" != "${SYSTEM_LINUX_MINT}" ]]; then if [[ "${SYSTEM_JUDGMENT}" != "${SYSTEM_LINUX_MINT}" ]]; then

14
DockerInstallation.sh
View File

@@ -1,6 +1,6 @@
#!/bin/bash #!/bin/bash
## Author: SuperManito ## Author: SuperManito
## Modified: 2025-03-16 ## Modified: 2025-03-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
@@ -382,7 +382,7 @@ function collect_system_info() {
## 判定系统类型、版本、版本号 ## 判定系统类型、版本、版本号
case "${SYSTEM_FACTIONS}" in case "${SYSTEM_FACTIONS}" in
"${SYSTEM_DEBIAN}") "${SYSTEM_DEBIAN}")
if [ ! -x /usr/bin/lsb_release ]; then if ! command -v lsb_release &>/dev/null; then
apt-get install -y lsb-release apt-get install -y lsb-release
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
output_error "lsb-release 软件包安装失败\n\n本脚本依赖 lsb_release 指令判断系统具体类型和版本，当前系统可能为精简安装，请自行安装后重新执行脚本！" output_error "lsb-release 软件包安装失败\n\n本脚本依赖 lsb_release 指令判断系统具体类型和版本，当前系统可能为精简安装，请自行安装后重新执行脚本！"
@@ -506,7 +506,7 @@ function collect_system_info() {
esac esac
## 判断是否可以使用高级交互式选择器 ## 判断是否可以使用高级交互式选择器
CAN_USE_ADVANCED_INTERACTIVE_SELECTION="false" CAN_USE_ADVANCED_INTERACTIVE_SELECTION="false"
if [ ! -z "$(command -v tput)" ]; then if command -v tput &>/dev/null; then
CAN_USE_ADVANCED_INTERACTIVE_SELECTION="true" CAN_USE_ADVANCED_INTERACTIVE_SELECTION="true"
fi fi
} }
@@ -527,7 +527,7 @@ function choose_mirrors() {
for ((a = 0; a < $list_arr_sum; a++)); do for ((a = 0; a < $list_arr_sum; a++)); do
list_arr[$a]="$(eval echo \${$1[a]})" list_arr[$a]="$(eval echo \${$1[a]})"
done done
if [ -x /usr/bin/printf ]; then if command -v printf &>/dev/null; then
for ((i = 0; i < ${#list_arr[@]}; i++)); do for ((i = 0; i < ${#list_arr[@]}; i++)); do
tmp_mirror_name=$(echo "${list_arr[i]}" | awk -F '@' '{print$1}') # 软件源名称 tmp_mirror_name=$(echo "${list_arr[i]}" | awk -F '@' '{print$1}') # 软件源名称
# tmp_mirror_url=$(echo "${list_arr[i]}" | awk -F '@' '{print$2}') # 软件源地址 # tmp_mirror_url=$(echo "${list_arr[i]}" | awk -F '@' '{print$2}') # 软件源地址
@@ -671,7 +671,7 @@ function choose_protocol() {
## 关闭防火墙和SELinux ## 关闭防火墙和SELinux
function close_firewall_service() { function close_firewall_service() {
if [ ! -x /usr/bin/systemctl ]; then if ! command -v systemctl &>/dev/null; then
return return
fi fi
if [[ "$(systemctl is-active firewalld)" == "active" ]]; then if [[ "$(systemctl is-active firewalld)" == "active" ]]; then
@@ -773,7 +773,7 @@ function get_package_manager() {
## 卸载 Docker Engine 原有版本软件包 ## 卸载 Docker Engine 原有版本软件包
function uninstall_original_version() { function uninstall_original_version() {
if [ -x /usr/bin/docker ]; then if command -v docker &>/dev/null; then
# 先停止并禁用 Docker 服务 # 先停止并禁用 Docker 服务
systemctl disable --now docker >/dev/null 2>&1 systemctl disable --now docker >/dev/null 2>&1
sleep 2s sleep 2s
@@ -1053,7 +1053,7 @@ function install_docker_engine() {
## 查看版本并验证安装结果 ## 查看版本并验证安装结果
function check_version() { function check_version() {
if [ -x /usr/bin/docker ]; then if command -v docker &>/dev/null; then
systemctl enable --now docker >/dev/null 2>&1 systemctl enable --now docker >/dev/null 2>&1
echo -en "\n当前安装版本：" echo -en "\n当前安装版本："
docker -v docker -v