From: Carl Baldwin <cnb@ball.(none)>
Date: Fri, 25 Nov 2005 18:25:05 +0000 (-0700)
Subject: Merge a fix to release-0.1
X-Git-Tag: release-0.4~15
X-Git-Url: http://git.pippins.net/embedvideo/images/%27%20.%20%24this-%3Ephpgw_js_url%20.%20%27/jscalendar/%7Bedit%7D?a=commitdiff_plain;h=31e73cf58bbda828b42c96e0c02eda6435d4f929;p=backups%2F.git

Merge a fix to release-0.1
---

31e73cf58bbda828b42c96e0c02eda6435d4f929
diff --cc scripts/cron-pack.sh
index 1594d68,2127e42..906b010
--- a/scripts/cron-pack.sh
+++ b/scripts/cron-pack.sh
@@@ -2,13 -2,12 +2,16 @@@
  
  export PATH=$(dirname $0):/bin:/usr/bin:/sbin
  
 +# source the default configuration
  . config.sh
  
 +# source the system specific configuration
 +[ -f /etc/lsbackups.conf ] && . /etc/lsbackups.conf
 +
- if [ -n "$(find $lastbackupfile -mtime +14)" -o -n "$(cat $statusfile | grep -i incomplete)" ]; then
+ days=15
+ minutes=$(($days * 1440 - 60))
+ 
+ if [ -n "$(find $lastbackupfile -mmin +$minutes)" -o -n "$(cat $statusfile | grep -i incomplete)" ]; then
    echo "Running backups from cron..."
    setsid pack-image.sh
    exit 0