Merge pull request #1060 from nested-universe/patch-1

Improve upgrade function

scripts/menus/9_upgrade.sh

@@ -1,6 +1,9 @@
 #!/bin/sh
 # Copyright (C) Juewuy
 
+[ -n "$__IS_MODULE_9_UPGRADE_LOADED" ] && return
+__IS_MODULE_9_UPGRADE_LOADED=1
+
 . "$CRASHDIR"/libs/check_dir_avail.sh
 . "$CRASHDIR"/libs/check_cpucore.sh
 . "$CRASHDIR"/libs/web_get_bin.sh
@@ -10,8 +13,10 @@ error_down(){
 	echo -e "或者参考 \033[32;4mhttps://juewuy.github.io/bdaz\033[0m 进行本地安装！"
 	sleep 1
 }
-#主界面
+
-upgrade(){
+# 更新/卸载功能菜单
+upgrade() {
+    while true; do
         echo "-----------------------------------------------"
         echo -ne "\033[32m正在检查更新！\033[0m\r"
         checkupdate
@@ -42,41 +47,35 @@ upgrade(){
         echo "-----------------------------------------------"
         read -p "请输入对应数字 > " num
         case "$num" in
-	0)
+        ""|0)
+            break
             ;;
         1)
             setscripts
             ;;
         2)
             setcore
-		upgrade
             ;;
         3)
             setgeo
-		upgrade
             ;;
         4)
             setdb
-		upgrade
             ;;
         5)
             setcrt
-	    upgrade
             ;;
         6)
             echo "-----------------------------------------------"
             echo -e "PAC配置链接为：\033[30;47m http://$host:$db_port/ui/pac \033[0m"
             echo -e "PAC的使用教程请参考：\033[4;32mhttps://juewuy.github.io/ehRUeewcv\033[0m"
             sleep 2
-	    upgrade
             ;;
         7)
             setserver
-	    upgrade
             ;;
         8)
             . "$CRASHDIR"/menus/5_task.sh && task_add
-	    upgrade
             ;;
         9)
             . "$CRASHDIR"/menus/uninstall.sh && uninstall
@@ -96,13 +95,16 @@ upgrade(){
             echo -e "特别感谢：\033[36m所有帮助及赞助过此项目的同仁们！\033[0m"
             echo "-----------------------------------------------"
             sleep 2
-		upgrade
             ;;
         *)
             errornum
+			sleep 1
+			break
             ;;
         esac
+    done
 }
+
 #检查更新
 checkupdate(){
 	get_bin "$TMPDIR"/version_new version echooff