roberto/PiGarden
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
lejubila
2017-09-01 01:06:53 +02:00
parent c370890f0b
commit 9fc7c971f1
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@@ -1,6 +1,7 @@
## 0.4.5 - xx/08/2017 ## 0.4.5 - xx/08/2017
- Implemented driver subsystem for interfacing with other board - Implemented driver subsystem for interfacing with other board
- Added driver spb16ch for interfacing with "Smart Power Board 16 channel with RTC" - 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 ## 0.4.4 - 17/06/2017
Remove lock/unlock from init function for resove bug Remove lock/unlock from init function for resove bug

12
include/cron.include.sh
View File

@@ -15,8 +15,8 @@ function cron_del {
fi fi
$CRONTAB -l > "$TMP_CRON_FILE" $CRONTAB -l > "$TMP_CRON_FILE"
local START=`$GREP -n "# START 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 END=`$GREP -n "^# END cron $CRON_TYPE $CRON_ARG$" "$TMP_CRON_FILE"| $CUT -d : -f 1`
local re='^[0-9]+$' local re='^[0-9]+$'
if ! [[ "$START" =~ $re ]] && ! [[ "$END" =~ $re ]] ; then if ! [[ "$START" =~ $re ]] && ! [[ "$END" =~ $re ]] ; then
@@ -79,8 +79,8 @@ function cron_add {
fi fi
$CRONTAB -l > "$TMP_CRON_FILE" $CRONTAB -l > "$TMP_CRON_FILE"
local START=`$GREP -n "# START 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 END=`$GREP -n "^# END cron $CRON_TYPE $CRON_ARG$" "$TMP_CRON_FILE"| $CUT -d : -f 1`
local re='^[0-9]+$' local re='^[0-9]+$'
local NEW_CRON=0 local NEW_CRON=0
@@ -228,8 +228,8 @@ function cron_get {
fi fi
$CRONTAB -l > "$TMP_CRON_FILE" $CRONTAB -l > "$TMP_CRON_FILE"
local START=`$GREP -n "# START 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 END=`$GREP -n "^# END cron $CRON_TYPE $CRON_ARG$" "$TMP_CRON_FILE"| $CUT -d : -f 1`
local re='^[0-9]+$' local re='^[0-9]+$'
local PREVIUS_CONTENT="" local PREVIUS_CONTENT=""