This commit is contained in:
Super Manito
2024-12-06 21:06:23 +08:00
parent 494591b57e
commit 691d821669
2 changed files with 3 additions and 1 deletions

View File

@@ -1036,6 +1036,7 @@ function choose_mirrors() {
fi fi
if [[ "${CAN_USE_ADVANCED_INTERACTIVE_SELECTION}" == "true" ]]; then if [[ "${CAN_USE_ADVANCED_INTERACTIVE_SELECTION}" == "true" ]]; then
sleep 1 >/dev/null 2>&1
eval "interactive_select_mirror \"\${${mirror_list_name}[@]}\" \"\\n \${BOLD}请选择你想使用的软件源:\${PLAIN}\\n\"" eval "interactive_select_mirror \"\${${mirror_list_name}[@]}\" \"\\n \${BOLD}请选择你想使用的软件源:\${PLAIN}\\n\""
SOURCE="${_SELECT_RESULT#*@}" SOURCE="${_SELECT_RESULT#*@}"
echo -e "\n${GREEN}${PLAIN} ${BOLD}${_SELECT_RESULT%@*}${PLAIN}" | sed "s| · | |g" echo -e "\n${GREEN}${PLAIN} ${BOLD}${_SELECT_RESULT%@*}${PLAIN}" | sed "s| · | |g"
@@ -1695,7 +1696,6 @@ function upgrade_software() {
eclean-packages --deep >/dev/null 2>&1 eclean-packages --deep >/dev/null 2>&1
;; ;;
esac esac
echo -e "\n$COMPLETE 清理完毕"
} }
############################################################################## ##############################################################################

View File

@@ -542,6 +542,7 @@ function choose_mirrors() {
if [[ -z "${SOURCE}" ]]; then if [[ -z "${SOURCE}" ]]; then
mirror_list_name="mirror_list_docker_ce" mirror_list_name="mirror_list_docker_ce"
if [[ "${CAN_USE_ADVANCED_INTERACTIVE_SELECTION}" == "true" ]]; then if [[ "${CAN_USE_ADVANCED_INTERACTIVE_SELECTION}" == "true" ]]; then
sleep 1 >/dev/null 2>&1
eval "interactive_select_mirror \"\${${mirror_list_name}[@]}\" \"\\n \${BOLD}请选择你想使用的 Docker CE 源:\${PLAIN}\\n\"" eval "interactive_select_mirror \"\${${mirror_list_name}[@]}\" \"\\n \${BOLD}请选择你想使用的 Docker CE 源:\${PLAIN}\\n\""
SOURCE="${_SELECT_RESULT#*@}" SOURCE="${_SELECT_RESULT#*@}"
echo -e "\n${GREEN}${PLAIN} ${BOLD}${_SELECT_RESULT%@*}${PLAIN}" echo -e "\n${GREEN}${PLAIN} ${BOLD}${_SELECT_RESULT%@*}${PLAIN}"
@@ -571,6 +572,7 @@ function choose_mirrors() {
if [[ -z "${SOURCE_REGISTRY}" ]]; then if [[ -z "${SOURCE_REGISTRY}" ]]; then
mirror_list_name="mirror_list_registry" mirror_list_name="mirror_list_registry"
if [[ "${CAN_USE_ADVANCED_INTERACTIVE_SELECTION}" == "true" ]]; then if [[ "${CAN_USE_ADVANCED_INTERACTIVE_SELECTION}" == "true" ]]; then
sleep 1 >/dev/null 2>&1
eval "interactive_select_mirror \"\${${mirror_list_name}[@]}\" \"\\n \${BOLD}请选择你想使用的 Docker Registry 源:\${PLAIN}\\n\"" eval "interactive_select_mirror \"\${${mirror_list_name}[@]}\" \"\\n \${BOLD}请选择你想使用的 Docker Registry 源:\${PLAIN}\\n\""
SOURCE_REGISTRY="${_SELECT_RESULT#*@}" SOURCE_REGISTRY="${_SELECT_RESULT#*@}"
echo -e "\n${GREEN}${PLAIN} Docker Registry${BOLD}${_SELECT_RESULT%@*}${PLAIN}" echo -e "\n${GREEN}${PLAIN} Docker Registry${BOLD}${_SELECT_RESULT%@*}${PLAIN}"