diff --git a/Config/Automation/manage.sh b/Config/Automation/manage.sh index 2b8aefd..c3990b1 100644 --- a/Config/Automation/manage.sh +++ b/Config/Automation/manage.sh @@ -21,7 +21,7 @@ case $pick in if [[ $i == "${path}/*" ]];then echo "该地址不存在脚本" fi - echo $i + basename $i done ;; '2') @@ -33,8 +33,11 @@ case $pick in echo "该地址不存在脚本" exit fi - script_number=$(( script_number+1 )) script_name=$(awk -F '.' '{print $1}' <<< "$(basename $i)") + if [[ $script_name == "linuxtool" ]]; then + continue + fi + script_number=$(( script_number+1 )) echo "${script_number}.${script_name}" script_arr[$script_number]=$script_name done diff --git a/Config/software.sh b/Config/software.sh index 5352ac9..a7aef30 100644 --- a/Config/software.sh +++ b/Config/software.sh @@ -88,7 +88,7 @@ if [[ ${soft_dick['docker']} == 2 ]];then docker_img_number[$docker_img_number_pick]=$i echo "${docker_img_number_pick}.${i}" done - read -p "请选择Docker镜像站(默认 ${docker_img_number[1]}):" docker_img_number_pick + read -p "请选择Docker镜像站(默认 1):" docker_img_number_pick declare docker_img if [[ $docker_img_number_pick =~ [1-${#docker_imgs[@]}] ]];then docker_img_number_pick=${docker_img_number[$docker_img_number_pick]}