X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=backupninja;h=380ffcc37f0e1afd7f7ae8edada2f63fcb46b045;hb=a917f89b1d0ef7b6ba08ae7c3b341683805b04a7;hp=3943724d3449c0ef12b02eaaf9fd7553c2522ac1;hpb=c7e96acc455c3b5c74f97e812072e1a55664adce;p=matthijs%2Fupstream%2Fbackupninja.git diff --git a/backupninja b/backupninja index 3943724..380ffcc 100755 --- a/backupninja +++ b/backupninja @@ -199,9 +199,9 @@ function isnow() { whendayofweek=$1; at=$2; whentime=$3; whenday=`toint "$whendayofweek"` whendayofweek=`tolower "$whendayofweek"` - whentime=`echo "$whentime" | sed 's/:[0-9][0-9]$//'` + whentime=`echo "$whentime" | sed 's/:[0-9][0-9]$//' | sed -r 's/^([0-9])$/0\1/'` - if [ "$whendayofweek" == "everyday" ]; then + if [ "$whendayofweek" == "everyday" -o "$whendayofweek" == "daily" ]; then whendayofweek=$nowdayofweek fi @@ -402,6 +402,7 @@ defaultwhen=$when getconf logfile /var/log/backupninja.log getconf usecolors "yes" getconf SLAPCAT /usr/sbin/slapcat +getconf LDAPSEARCH /usr/bin/ldapsearch getconf RDIFFBACKUP /usr/bin/rdiff-backup getconf MYSQL /usr/bin/mysql getconf MYSQLHOTCOPY /usr/bin/mysqlhotcopy