Merge pull request #1103 from sofia-riese/patch-5

refactor: replace recursion with while loop in setcustcore

scripts/menus/9_upgrade.sh

@@ -228,15 +228,19 @@ switch_core(){ #clash与singbox内核切换
 		}
 	}
 }
-getcore(){ #下载内核文件
+
-	. "$CRASHDIR"/libs/core_tools.sh #调用下载工具
+# 下载内核文件
+getcore() {
+    # 调用下载工具
+    . "$CRASHDIR"/libs/core_tools.sh
+
     [ -z "$crashcore" ] && crashcore=meta
     [ -z "$cpucore" ] && check_cpucore
     [ "$crashcore" = unknow ] && setcoretype
     echo "$crashcore" | grep -q 'singbox' && core_new=singbox || core_new=clash
     # 获取在线内核文件
     echo "-----------------------------------------------"
-	echo "正在在线获取$crashcore核心文件……"
+    echo "正在在线获取$crashcore核心文件......"
     core_webget
     case "$?" in
     0)
@@ -256,7 +260,7 @@ getcore(){ #下载内核文件
         ;;
     esac
 }
-setcustcore(){ #自定义内核
+
 checkcustcore() {
     [ "$api_tag" = "latest" ] && api_url=latest || api_url="tags/$api_tag"
     # 通过githubapi获取内核信息
@@ -269,7 +273,7 @@ setcustcore(){ #自定义内核
         [ -n "$(echo $cpucore | grep mips)" ] && cpu_type=mips || cpu_type=$cpucore
         cat "$TMPDIR"/github_api | grep "browser_download_url" | grep -oE "https://github.com/${project}/releases/download.*linux.*${cpu_type}.*\.gz\"$" | sed 's/"//' >"$TMPDIR"/core.list
         rm -rf "$TMPDIR"/github_api
-			#
+
         if [ -s "$TMPDIR"/core.list ]; then
             echo "-----------------------------------------------"
             echo -e "内核版本：\033[36m$release_tag\033[0m"
@@ -283,7 +287,7 @@ setcustcore(){ #自定义内核
             read -p "请输入对应数字 > " num
             case "$num" in
             0)
-					setcustcore
+                return 0
                 ;;
             [1-9] | [1-9][0-9])
                 if [ "$num" -le "$(wc -l <"$TMPDIR"/core.list)" ]; then
@@ -291,10 +295,12 @@ setcustcore(){ #自定义内核
                     getcore
                 else
                     errornum
+                    sleep 1
                 fi
                 ;;
             *)
                 errornum
+                sleep 1
                 ;;
             esac
         else
@@ -307,6 +313,10 @@ setcustcore(){ #自定义内核
     fi
     rm -rf "$TMPDIR"/core.list
 }
+
+# 自定义内核
+setcustcore() {
+    while true; do
         [ -z "$cpucore" ] && check_cpucore
         echo "-----------------------------------------------"
         echo -e "\033[36m此处内核通常源自互联网采集，此处致谢各位开发者！\033[0m"
@@ -328,6 +338,9 @@ setcustcore(){ #自定义内核
         echo -e " 0 返回上级菜单"
         read -p "请输入对应数字 > " num
         case "$num" in
+        "" | 0)
+            break
+            ;;
         1)
             project=MetaCubeX/mihomo
             api_tag=latest
@@ -359,9 +372,14 @@ setcustcore(){ #自定义内核
             getcore
             ;;
         *)
+            errornum
+            sleep 1
+            break
             ;;
         esac
+    done
 }
+
 setziptype(){
 	echo "-----------------------------------------------"
 	echo -e "请选择内核内核分支及压缩方式：\033[0m"