From 9fc7c971f13a470e67f2fa1d08f941cb68d0e96c Mon Sep 17 00:00:00 2001 From: lejubila Date: Fri, 1 Sep 2017 01:06:53 +0200 Subject: [PATCH] Corretto problema su gestione cron con cron type simili. Per esempio se veniva inserita una schedulazione per la zona Zona_10 questa veniva riconosciuta anche per la zona con nome Zona_1 --- CHANGELOG.md | 1 + include/cron.include.sh | 12 ++++++------ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 495a0ba..bc354a1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,7 @@ ## 0.4.5 - xx/08/2017 - Implemented driver subsystem for interfacing with other board - Added driver spb16ch for interfacing with "Smart Power Board 16 channel with RTC" +- Fix problem with cron management on similar type cron ## 0.4.4 - 17/06/2017 Remove lock/unlock from init function for resove bug diff --git a/include/cron.include.sh b/include/cron.include.sh index 56a1cad..fd1e1ce 100644 --- a/include/cron.include.sh +++ b/include/cron.include.sh @@ -15,8 +15,8 @@ function cron_del { fi $CRONTAB -l > "$TMP_CRON_FILE" - local START=`$GREP -n "# START cron $CRON_TYPE $CRON_ARG" "$TMP_CRON_FILE"| $CUT -d : -f 1` - local END=`$GREP -n "# END cron $CRON_TYPE $CRON_ARG" "$TMP_CRON_FILE"| $CUT -d : -f 1` + local START=`$GREP -n "^# START cron $CRON_TYPE $CRON_ARG$" "$TMP_CRON_FILE"| $CUT -d : -f 1` + local END=`$GREP -n "^# END cron $CRON_TYPE $CRON_ARG$" "$TMP_CRON_FILE"| $CUT -d : -f 1` local re='^[0-9]+$' if ! [[ "$START" =~ $re ]] && ! [[ "$END" =~ $re ]] ; then @@ -79,8 +79,8 @@ function cron_add { fi $CRONTAB -l > "$TMP_CRON_FILE" - local START=`$GREP -n "# START cron $CRON_TYPE $CRON_ARG" "$TMP_CRON_FILE"| $CUT -d : -f 1` - local END=`$GREP -n "# END cron $CRON_TYPE $CRON_ARG" "$TMP_CRON_FILE"| $CUT -d : -f 1` + local START=`$GREP -n "^# START cron $CRON_TYPE $CRON_ARG$" "$TMP_CRON_FILE"| $CUT -d : -f 1` + local END=`$GREP -n "^# END cron $CRON_TYPE $CRON_ARG$" "$TMP_CRON_FILE"| $CUT -d : -f 1` local re='^[0-9]+$' local NEW_CRON=0 @@ -228,8 +228,8 @@ function cron_get { fi $CRONTAB -l > "$TMP_CRON_FILE" - local START=`$GREP -n "# START cron $CRON_TYPE $CRON_ARG" "$TMP_CRON_FILE"| $CUT -d : -f 1` - local END=`$GREP -n "# END cron $CRON_TYPE $CRON_ARG" "$TMP_CRON_FILE"| $CUT -d : -f 1` + local START=`$GREP -n "^# START cron $CRON_TYPE $CRON_ARG$" "$TMP_CRON_FILE"| $CUT -d : -f 1` + local END=`$GREP -n "^# END cron $CRON_TYPE $CRON_ARG$" "$TMP_CRON_FILE"| $CUT -d : -f 1` local re='^[0-9]+$' local PREVIUS_CONTENT=""