From 28018b705b20f012e7419bf0c7cfb55bc0d727bc Mon Sep 17 00:00:00 2001
From: hanhh <18330117883@163.com>
Date: Sun, 22 Aug 2021 22:02:31 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=9C=AA=E4=BA=A7=E7=94=9F?=
 =?UTF-8?q?=E6=97=A5=E5=BF=97=E6=96=87=E4=BB=B6cat=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 shell/task.sh   |  8 ++++----
 shell/update.sh | 16 ++++++++--------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/shell/task.sh b/shell/task.sh
index f6b59175..e4d52be9 100755
--- a/shell/task.sh
+++ b/shell/task.sh
@@ -93,7 +93,7 @@ run_normal() {
 
     local begin_time=$(date '+%Y-%m-%d %H:%M:%S')
     eval echo -e "\#\# 开始执行... $begin_time\\\n" $cmd
-    eval cat $task_error_log_path $cmd
+    [[ -f $task_error_log_path ]] && eval cat $task_error_log_path $cmd
 
     local id=$(cat $list_crontab_user | grep -E "$cmd_task $first_param" | perl -pe "s|.*ID=(.*) $cmd_task $first_param\.*|\1|" | head -1 | awk -F " " '{print $1}')
     [[ $id ]] && update_cron "\"$id\"" "0" "$$" "$log_path"
@@ -129,7 +129,7 @@ run_concurrent() {
 
     local begin_time=$(date '+%Y-%m-%d %H:%M:%S')
     eval echo -e "\#\# 开始执行... $begin_time\\\n" $cmd
-    eval cat $task_error_log_path $cmd
+    [[ -f $task_error_log_path ]] && eval cat $task_error_log_path $cmd
 
     local id=$(cat $list_crontab_user | grep -E "$cmd_task $first_param" | perl -pe "s|.*ID=(.*) $cmd_task $first_param\.*|\1|" | head -1 | awk -F " " '{print $1}')
     [[ $id ]] && update_cron "\"$id\"" "0" "$$" "$log_path"
@@ -170,7 +170,7 @@ run_else() {
 
     local begin_time=$(date '+%Y-%m-%d %H:%M:%S')
     eval echo -e "\#\# 开始执行... $begin_time\\\n" $cmd
-    eval cat $task_error_log_path $cmd
+    [[ -f $task_error_log_path ]] && eval cat $task_error_log_path $cmd
 
     local id=$(cat $list_crontab_user | grep -E "$cmd_task $first_param" | perl -pe "s|.*ID=(.*) $cmd_task $first_param\.*|\1|" | head -1 | awk -F " " '{print $1}')
     [[ $id ]] && update_cron "\"$id\"" "0" "$$" "$log_path"
@@ -220,7 +220,7 @@ main() {
             run_else "$@"
             ;;
         esac
-        cat $log_path
+        [[ -f $log_path ]] && cat $log_path
     elif [[ $# -eq 0 ]]; then
         echo
         usage
diff --git a/shell/update.sh b/shell/update.sh
index 47df549a..9645a649 100755
--- a/shell/update.sh
+++ b/shell/update.sh
@@ -450,12 +450,12 @@ main() {
     case $p1 in
     update)
         eval echo -e "\#\# 开始执行... $begin_time\\\n" $cmd
-        eval cat $task_error_log_path $cmd
+        [[ -f $task_error_log_path ]] && eval cat $task_error_log_path $cmd
         eval update_qinglong "$2" $cmd
         ;;
     extra)
         eval echo -e "\#\# 开始执行... $begin_time\\\n" $cmd
-        eval cat $task_error_log_path $cmd
+        [[ -f $task_error_log_path ]] && eval cat $task_error_log_path $cmd
         eval run_extra_shell $cmd
         ;;
     repo)
@@ -465,7 +465,7 @@ main() {
         [[ "$show_log" == "false" ]] && cmd=">> $log_path"
 
         eval echo -e "\#\# 开始执行... $begin_time\\\n" $cmd
-        cat $task_error_log_path $cmd
+        [[ -f $task_error_log_path ]] && cat $task_error_log_path $cmd
         if [[ -n $p2 ]]; then
             eval update_repo "$p2" "$p3" "$p4" "$p5" "$p6" $cmd
         else
@@ -480,7 +480,7 @@ main() {
         [[ "$show_log" == "false" ]] && cmd=">> $log_path"
 
         eval echo -e "\#\# 开始执行... $begin_time\\\n" $cmd
-        eval cat $task_error_log_path $cmd
+        [[ -f $task_error_log_path ]] && eval cat $task_error_log_path $cmd
         if [[ -n $p2 ]]; then
             eval update_raw "$p2" $cmd
         else
@@ -490,17 +490,17 @@ main() {
         ;;
     rmlog)
         eval echo -e "\#\# 开始执行... $begin_time\\\n" $cmd
-        eval cat $task_error_log_path $cmd
+        [[ -f $task_error_log_path ]] && eval cat $task_error_log_path $cmd
         eval . $dir_shell/rmlog.sh "$p2" $cmd
         ;;
     bot)
         eval echo -e "\#\# 开始执行... $begin_time\\\n" $cmd
-        eval cat $task_error_log_path $cmd
+        [[ -f $task_error_log_path ]] && eval cat $task_error_log_path $cmd
         eval . $dir_shell/bot.sh $cmd
         ;;
     check)
         eval echo -e "\#\# 开始执行... $begin_time\\\n" $cmd
-        eval cat $task_error_log_path $cmd
+        [[ -f $task_error_log_path ]] && eval cat $task_error_log_path $cmd
         eval . $dir_shell/check.sh $cmd
         ;;
     *)
@@ -511,7 +511,7 @@ main() {
     local end_time=$(date '+%Y-%m-%d %H:%M:%S')
     local diff_time=$(($(date +%s -d "$end_time") - $(date +%s -d "$begin_time")))
     eval echo -e "\\\n\#\# 执行结束... $end_time  耗时 $diff_time 秒" $cmd
-    cat $log_path
+    [[ -f $log_path ]] && cat $log_path
 }
 
 main "$@"