Merge branch 'dev' of https://github.com/juewuy/ShellCrash into master

scripts/menus/5_task.sh

@@ -69,7 +69,7 @@ task_user_del(){ #自定义命令删除
 	echo "-----------------------------------------------"
 	cat "$CRASHDIR"/task/task.user 2>/dev/null | grep -Ev '^#' | awk -F '#' '{print $1" "$3}'
 	echo "-----------------------------------------------"
-	echo 0 返回上级菜单
+	echo "0 返回上级菜单"
 	echo "-----------------------------------------------"
 	read -p "请输入对应数字 > " num
 	if [ -n "$num" ];then
@@ -323,7 +323,10 @@ task_recom(){ #任务推荐
 		echo -e "任务【在每日的3点0分重启服务】\033[32m添加成功！\033[0m"
 	}
 }
-task_menu(){ #任务菜单
+
+# 任务菜单
+task_menu() {
+    while true; do
         #检测并创建自定义任务文件
         [ -f "$CRASHDIR"/task/task.user ] || echo '#任务ID(必须>200并顺序排列)#任务命令#任务说明(#号隔开，任务命令和说明中都不允许包含#号)' >"$CRASHDIR"/task/task.user
         echo "-----------------------------------------------"
@@ -340,16 +343,15 @@ task_menu(){ #任务菜单
         echo -e " 0 返回上级菜单"
         read -p "请输入对应数字 > " num
         case "$num" in
-	0)
+        "" | 0)
+            break
             ;;
         1)
             task_add
-		task_menu
             ;;
         2)
             task_manager
             rm -rf "$TMPDIR"/task_list
-		task_menu
             ;;
         3)
             if [ -n "$(cat "$TMPDIR"/ShellCrash.log | grep '任务【')" ]; then
@@ -359,29 +361,26 @@ task_menu(){ #任务菜单
                 echo -e "\033[31m未找到任务相关执行日志！\033[0m"
             fi
             sleep 1
-		task_menu
             ;;
         4)
             echo "-----------------------------------------------"
             echo -e "\033[36m请在日志工具中配置相关推送通道及推送开关\033[0m"
             . "$CRASHDIR"/menus/8_tools.sh && log_pusher
-		task_menu
             ;;
         5)
             task_user_add
-		task_menu
             ;;
         6)
             task_user_del
-		task_menu
             ;;
         7)
             task_recom
-		task_menu
             ;;
         *)
             errornum
+            sleep 1
+            break
             ;;
-
         esac
+    done
 }