From 5874d52f5393ac5630a1ff7c3553ea68befc7936 Mon Sep 17 00:00:00 2001
From: hanhh <hanhh@gmail.com>
Date: Fri, 4 Jun 2021 19:14:56 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dcron=E6=AD=A3=E5=88=99?=
 =?UTF-8?q?=E5=8C=B9=E9=85=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 shell/update.sh | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/shell/update.sh b/shell/update.sh
index ccc51c9b..344c5688 100755
--- a/shell/update.sh
+++ b/shell/update.sh
@@ -125,13 +125,13 @@ add_cron() {
         if [ -f $file ]; then
             cron_line=$(
                 perl -ne "{
-                    print if /.*([\d\*]*[\*-\/,\d]*[\d\*] ){4,5}[\d\*]*[\*-\/,\d]*[\d\*]( |,|\").*/
-                }" $file |
+                        print if /.*([\d\*]*[\*-\/,\d]*[\d\*] ){4,5}[\d\*]*[\*-\/,\d]*[\d\*]( |,|\").*$file_name/
+                    }" $file |
                     perl -pe "{
-                    s|[^\d\*]*(([\d\*]*[\*-\/,\d]*[\d\*] ){4,5}[\d\*]*[\*-\/,\d]*[\d\*])( \|,\|\").*|\1|g;
-                    s|\*([\d\*])(.*)|\1\2|g;
-                    s|  | |g;
-                }" | sort -u | head -1
+                        s|[^\d\*]*(([\d\*]*[\*-\/,\d]*[\d\*] ){4,5}[\d\*]*[\*-\/,\d]*[\d\*])( \|,\|\").*/?$file_name.*|\1|g;
+                        s|\*([\d\*])(.*)|\1\2|g;
+                        s|  | |g;
+                    }" | sort -u | head -1
             )
             cron_name=$(grep "new Env" $file | awk -F "\(" '{print $2}' | awk -F "\)" '{print $1}' | sed 's:^.\(.*\).$:\1:' | head -1)
             [[ -z $cron_name ]] && cron_name="$file_name"
@@ -194,10 +194,10 @@ update_raw() {
         cp -f $raw_file_name $dir_scripts/${filename}
         cron_line=$(
             perl -ne "{
-                    print if /.*([\d\*]*[\*-\/,\d]*[\d\*] ){4,5}[\d\*]*[\*-\/,\d]*[\d\*]( |,|\").*/
+                    print if /.*([\d\*]*[\*-\/,\d]*[\d\*] ){4,5}[\d\*]*[\*-\/,\d]*[\d\*]( |,|\").*$raw_file_name/
                 }" $raw_file_name |
                 perl -pe "{
-                    s|[^\d\*]*(([\d\*]*[\*-\/,\d]*[\d\*] ){4,5}[\d\*]*[\*-\/,\d]*[\d\*])( \|,\|\").*|\1|g;
+                    s|[^\d\*]*(([\d\*]*[\*-\/,\d]*[\d\*] ){4,5}[\d\*]*[\*-\/,\d]*[\d\*])( \|,\|\").*/?$raw_file_name.*|\1|g;
                     s|\*([\d\*])(.*)|\1\2|g;
                     s|  | |g;
                 }" | sort -u | head -1

From ece1ca84e2dbbedd1e2d37f1cf03c9b9e6e78570 Mon Sep 17 00:00:00 2001
From: hanhh <hanhh@gmail.com>
Date: Fri, 4 Jun 2021 20:49:10 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dcron=E6=AD=A3=E5=88=99?=
 =?UTF-8?q?=E5=8C=B9=E9=85=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 shell/update.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/shell/update.sh b/shell/update.sh
index 344c5688..5eba4e96 100755
--- a/shell/update.sh
+++ b/shell/update.sh
@@ -135,6 +135,7 @@ add_cron() {
             )
             cron_name=$(grep "new Env" $file | awk -F "\(" '{print $2}' | awk -F "\)" '{print $1}' | sed 's:^.\(.*\).$:\1:' | head -1)
             [[ -z $cron_name ]] && cron_name="$file_name"
+            [[ -z $cron_line ]] && cron_line=$(grep "cron:" $file | awk -F ":" '{print $2}' | xargs)
             [[ -z $cron_line ]] && cron_line="0 6 * * *"
             result=$(add_cron_api "$cron_line:$cmd_task $file:$cron_name")
             echo -e "$result"