projects
/
wizbackup.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of ssh://codewiz.org/git/bernie/wizbackup
[wizbackup.git]
/
wizbackup
diff --git
a/wizbackup
b/wizbackup
index c88cc7e11861aae6220690401a0dadec5f8e302f..39534ac7203b67f96070e7b8666f8fa75183fd55 100755
(executable)
--- a/
wizbackup
+++ b/
wizbackup
@@
-4,7
+4,7
@@
# Based on incremental-backup 0.1 by Matteo Mattei
#
# Copyright 2006 Matteo Mattei <matteo.mattei@gmail.com>
# 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, 201
2, 201
5 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
#
# 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
@@
-38,6
+38,8
@@
SRC=$1; shift
# Destination directory (will be created if it doesn't exist)
DEST=$1; shift
# Destination directory (will be created if it doesn't exist)
DEST=$1; shift
+CONF_FILE="/etc/wizbackup/wizbackup.conf"
+
# NOTE: --timeout needs to be large enough: if a large dir tree don't change a lot of time can pass without I/O
# NOTE: --inplace will clobber linked files in older snapshots. DON'T USE IT!
RSYNC_OPTS="-HAXa --stats --timeout 1800 --numeric-ids --delete --delete-excluded --ignore-errors $@"
# NOTE: --timeout needs to be large enough: if a large dir tree don't change a lot of time can pass without I/O
# NOTE: --inplace will clobber linked files in older snapshots. DON'T USE IT!
RSYNC_OPTS="-HAXa --stats --timeout 1800 --numeric-ids --delete --delete-excluded --ignore-errors $@"
@@
-57,6
+59,9
@@
elif [ $(date +"%w") = 0 ]; then
fi
DEST="`echo $DEST | sed -e 's/\/$//'`"
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
# Use "backup" ssh key with ssh protocol, or password file for rsync protocol
if [ "${SRC%:*}" == "rsync" ]; then
@@
-168,7
+173,7
@@
do_test() {
# make sure to be root
if (( `id -u` != 0 )); then { echo "Sorry, must be root. Exiting..."; exit; } fi
# 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 6 ""
echo "$(date): $0 $SRC $DEST $@"
do_init
do_prune 6 ""