Merge pull request #3092 from ascob/watchcat

watchcat: fix operation of mode 'always'
This commit is contained in:
Ted Hess 2016-09-16 17:48:48 -04:00 committed by GitHub
commit f95647218a
2 changed files with 2 additions and 4 deletions

View File

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=watchcat
PKG_VERSION:=1
PKG_RELEASE:=5
PKG_RELEASE:=6
PKG_MAINTAINER:=Roger D <rogerdammit@gmail.com>
PKG_LICENSE:=GPL-2.0

View File

@ -50,7 +50,7 @@ load_watchcat() {
pingperiod="$seconds"
if [ "$pingperiod" -ge 0 ]
then
[ "$pingperiod" -le "$period" ] \
[ "$pingperiod" -lt "$period" ] \
|| append_string "error" "pingperiod must be less than period" "; "
else
append_string "error" 'pingperiod is not a valid time value (ex: "30"; "4m"; "6h"; "2d")' "; "
@ -59,8 +59,6 @@ load_watchcat() {
pingperiod="$((period/20))"
fi
}
[ "$pingperiod" -lt "$period" -o "$mode" = "always" ] \
|| append_string "error" "pingperiod is not recognized" "; "
[ "$forcedelay" -ge 0 ] \
|| append_string "error" "forcedelay must be a integer greater or equal than 0, where 0 means disabled" "; "