From 4cae9bcfb9ae42083d71fae210389eacb41893a2 Mon Sep 17 00:00:00 2001
From: hanhh <18330117883@163.com>
Date: Mon, 23 Aug 2021 10:43:26 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9B=9E=E9=80=80update.sh?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 shell/update.sh | 65 +++++++++++++++++--------------------------------
 1 file changed, 23 insertions(+), 42 deletions(-)

diff --git a/shell/update.sh b/shell/update.sh
index 9645a649..3cfcb24b 100755
--- a/shell/update.sh
+++ b/shell/update.sh
@@ -423,17 +423,6 @@ get_uniq_path() {
 }
 
 main() {
-    show_log="false"
-    while getopts ":l" opt
-    do
-        case $opt in
-            l)
-                show_log="true"
-                ;;
-        esac
-    done
-    [[ "$show_log" == "true" ]] && shift $(($OPTIND - 1))
-    
     local p1=$1
     local p2=$2
     local p3=$3
@@ -442,32 +431,26 @@ main() {
     local p6=$6
     local log_time=$(date "+%Y-%m-%d-%H-%M-%S")
     local log_path="$dir_log/update/${log_time}_$p1.log"
-    
-    local cmd=">> $log_path"
-    [[ "$show_log" == "true" ]] && cmd=""
-
     local begin_time=$(date '+%Y-%m-%d %H:%M:%S')
     case $p1 in
     update)
-        eval echo -e "\#\# 开始执行... $begin_time\\\n" $cmd
-        [[ -f $task_error_log_path ]] && eval cat $task_error_log_path $cmd
-        eval update_qinglong "$2" $cmd
+        echo -e "## 开始执行... $begin_time\n" >> $log_path
+        cat $task_error_log_path >> $log_path
+        update_qinglong "$2" >> $log_path
         ;;
     extra)
-        eval echo -e "\#\# 开始执行... $begin_time\\\n" $cmd
-        [[ -f $task_error_log_path ]] && eval cat $task_error_log_path $cmd
-        eval run_extra_shell $cmd
+        echo -e "## 开始执行... $begin_time\n" >> $log_path
+        cat $task_error_log_path >> $log_path
+        run_extra_shell >> $log_path
         ;;
     repo)
         get_user_info
         get_uniq_path "$p2" "$p6"
         log_path="$dir_log/update/${log_time}_${uniq_path}.log"
-        [[ "$show_log" == "false" ]] && cmd=">> $log_path"
-
-        eval echo -e "\#\# 开始执行... $begin_time\\\n" $cmd
-        [[ -f $task_error_log_path ]] && cat $task_error_log_path $cmd
+        echo -e "## 开始执行... $begin_time\n" >> $log_path
+        cat $task_error_log_path >> $log_path
         if [[ -n $p2 ]]; then
-            eval update_repo "$p2" "$p3" "$p4" "$p5" "$p6" $cmd
+            update_repo "$p2" "$p3" "$p4" "$p5" "$p6" >> $log_path
         else
             echo -e "命令输入错误...\n"
             usage
@@ -477,31 +460,29 @@ main() {
         get_user_info
         get_uniq_path "$p2"
         log_path="$dir_log/update/${log_time}_${uniq_path}.log"
-        [[ "$show_log" == "false" ]] && cmd=">> $log_path"
-
-        eval echo -e "\#\# 开始执行... $begin_time\\\n" $cmd
-        [[ -f $task_error_log_path ]] && eval cat $task_error_log_path $cmd
+        echo -e "## 开始执行... $begin_time\n" >> $log_path
+        cat $task_error_log_path >> $log_path
         if [[ -n $p2 ]]; then
-            eval update_raw "$p2" $cmd
+            update_raw "$p2" >> $log_path
         else
             echo -e "命令输入错误...\n"
             usage
         fi
         ;;
     rmlog)
-        eval echo -e "\#\# 开始执行... $begin_time\\\n" $cmd
-        [[ -f $task_error_log_path ]] && eval cat $task_error_log_path $cmd
-        eval . $dir_shell/rmlog.sh "$p2" $cmd
+        echo -e "## 开始执行... $begin_time\n" >> $log_path
+        cat $task_error_log_path >> $log_path
+        . $dir_shell/rmlog.sh "$p2" >> $log_path
         ;;
     bot)
-        eval echo -e "\#\# 开始执行... $begin_time\\\n" $cmd
-        [[ -f $task_error_log_path ]] && eval cat $task_error_log_path $cmd
-        eval . $dir_shell/bot.sh $cmd
+        echo -e "## 开始执行... $begin_time\n" >> $log_path
+        cat $task_error_log_path >> $log_path
+        . $dir_shell/bot.sh >> $log_path
         ;;
     check)
-        eval echo -e "\#\# 开始执行... $begin_time\\\n" $cmd
-        [[ -f $task_error_log_path ]] && eval cat $task_error_log_path $cmd
-        eval . $dir_shell/check.sh $cmd
+        echo -e "## 开始执行... $begin_time\n" >> $log_path
+        cat $task_error_log_path >> $log_path
+        . $dir_shell/check.sh >> $log_path
         ;;
     *)
         echo -e "命令输入错误...\n"
@@ -510,8 +491,8 @@ main() {
     esac
     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
-    [[ -f $log_path ]] && cat $log_path
+    echo -e "\n## 执行结束... $end_time  耗时 $diff_time 秒" >> $log_path
+    cat $log_path
 }
 
 main "$@"