Merge branch 'master' of ssh://codewiz.org/git/bernie/wizbackup

Conflicts:
	wizbackup

diff --cc wizbackup
index c88cc7e11861aae6220690401a0dadec5f8e302f,0656128e089f65f2477f164f9804c3cf9b974c2c..39534ac7203b67f96070e7b8666f8fa75183fd55
--- 1/wizbackup
--- 2/wizbackup
+++ b/wizbackup
@@@ -4,7 -4,7 +4,7 @@@
  # Based on incremental-backup 0.1 by Matteo Mattei
  #
  # Copyright 2006 Matteo Mattei <matteo.mattei@gmail.com>
- # Copyright 2007, 2008, 2009, 2010, 2011, 2015 Bernie Innocenti <bernie@codewiz.org>
 -# Copyright 2007, 2008, 2009, 2010, 2011, 2012 Bernie Innocenti <bernie@codewiz.org>
++# Copyright 2007, 2008, 2009, 2010, 2011, 2012, 2015 Bernie Innocenti <bernie@codewiz.org>
  #
  #  This program is free software: you can redistribute it and/or modify
  #  it under the terms of the GNU General Public License as published by
@@@ -49,14 -51,12 +51,17 @@@ MONTHS=
  MIN_FREE_GB=10
  
  RESULT=500
 -DATE=`date +"%Y%m%d"`
 +DATE=$(date +"%Y%m%d")
 +if [ $(date +"%d") = 1 ]; then
 +      DATE="$DATE-monthly"
 +elif [ $(date +"%w") = 0 ]; then
 +      DATE="$DATE-weekly"
 +fi
  DEST="`echo $DEST | sed -e 's/\/$//'`"
  
+ if [ -f "$CONF_FILE" ]; then
+       source /etc/wizbackup/wizbackup.conf
+ fi
  
  # Use "backup" ssh key with ssh protocol, or password file for rsync protocol
  if [ "${SRC%:*}" == "rsync" ]; then
@@@ -168,12 -173,10 +173,12 @@@ do_test() 
  # make sure to be root
  if (( `id -u` != 0 )); then { echo "Sorry, must be root.  Exiting..."; exit; } fi
  
- echo "$(date): BEGIN backup: $SRC -> $DEST"
+ echo "$(date): BEGIN backup: $0 $@"
  echo "$(date): $0 $SRC $DEST $@"
  do_init
 -do_prune
 +do_prune 6 ""
 +do_prune 4 "-weekly"
 +do_prune $MONTHS "-monthly"
  do_test
  do_link
  do_backup