Explorar el Código

Fix cron validation

New vesta cron generator not works if you have some format ranges like:

1,2 2 * 5,2,4,1
or
1-10 * * * *
Maksim Usmanov | Maks hace 8 años
padre
commit
5a108be182
Se han modificado 1 ficheros con 7 adiciones y 3 borrados
  1. 7 3
      func/main.sh

+ 7 - 3
func/main.sh

@@ -753,9 +753,13 @@ is_cron_format_valid() {
             fi
         done
     fi
-    if [[ "$1" =~ ^[0-9]+$ ]] && [ "$1" -le $limit ]; then
-        check_format='ok'
-    fi
+    crn_values=$(echo $1 |tr "," " " | tr "-" " ")
+    for crn_vl in $crn_values
+        do
+            if [[ "$crn_vl" =~ ^[0-9]+$ ]] && [ "$crn_vl" -le $limit ]; then
+                 check_format='ok'
+              fi
+        done
     if [ "$check_format" != 'ok' ]; then
         check_result $E_INVALID "invalid $2 format :: $1"
     fi