projects
/
wizbackup.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Bump version to 3.0.
[wizbackup.git]
/
wizbackup
diff --git
a/wizbackup
b/wizbackup
index 0656128e089f65f2477f164f9804c3cf9b974c2c..d2aea752bcaa01049411683bdf474bb08aee03ca 100755
(executable)
--- a/
wizbackup
+++ b/
wizbackup
@@
-1,10
+1,10
@@
#!/bin/bash
#
#!/bin/bash
#
-# WizBackup
2
.0 - Simple rsync backup with snapshots
+# WizBackup
3
.0 - Simple rsync backup with snapshots
# 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, 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
#
# 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
@@
-44,14
+44,19
@@
CONF_FILE="/etc/wizbackup/wizbackup.conf"
# 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: --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 $@"
-# Number of
saved snapshots
-SNAPSHOTS=45
+# Number of
months to keep
+MONTHS=3
# Abort backup if the destination volume has less than these GBs free
MIN_FREE_GB=10
RESULT=500
# Abort backup if the destination volume has less than these GBs free
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
DEST="`echo $DEST | sed -e 's/\/$//'`"
if [ -f "$CONF_FILE" ]; then
@@
-66,14
+71,12
@@
else
fi
# Error tolerant grep
fi
# Error tolerant grep
-tgrep()
-{
+tgrep() {
grep "$@"
return 0
}
grep "$@"
return 0
}
-do_backup()
-{
+do_backup() {
set -o pipefail
echo "$(date): rsync $RSYNC_OPTS $SRC $DEST/tmp/"
rsync $RSYNC_OPTS "$SRC" "$DEST/tmp/" 2>&1 | tgrep -v -E 'vanished|some files'
set -o pipefail
echo "$(date): rsync $RSYNC_OPTS $SRC $DEST/tmp/"
rsync $RSYNC_OPTS "$SRC" "$DEST/tmp/" 2>&1 | tgrep -v -E 'vanished|some files'
@@
-96,9
+99,7
@@
do_backup()
set +o pipefail
}
set +o pipefail
}
-
-do_init()
-{
+do_init() {
# Safety net (4 slashes just in case)
case "$DEST" in
/|//|///|////) exit 666 ;;
# Safety net (4 slashes just in case)
case "$DEST" in
/|//|///|////) exit 666 ;;
@@
-112,18
+113,18
@@
do_init()
cd "$DEST" || exit 668
}
cd "$DEST" || exit 668
}
-do_prune()
-{
- local old=`ls | grep -v tmp | head -n -$SNAPSHOTS | tr '\n' ' '`
- if [ ! -z "$old" ]; then
+do_prune() {
+ local num_snapshots="$1"
+ local suffix="$2"
+ local oldest="$(ls -d [0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9]$suffix | head -n -$num_snapshots)"
+ for old in $oldest; do
echo "$(date): Removing oldest snapshot(s): $old..."
echo "$(date): Removing oldest snapshot(s): $old..."
- rm -rf
$old
|| exit 669
- fi
+ rm -rf
"$old"
|| exit 669
+ done
}
}
-do_link()
-{
- local newest=`ls | grep -v tmp | tail -n 1`
+do_link() {
+ local newest=`ls -d [0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9]* | tail -n 1`
if [ -d "$DEST/tmp" ]; then
echo "$(date): Continuing with pre-existing snapshot $DEST/tmp"
elif [ -z "$newest" ]; then
if [ -d "$DEST/tmp" ]; then
echo "$(date): Continuing with pre-existing snapshot $DEST/tmp"
elif [ -z "$newest" ]; then
@@
-142,8
+143,7
@@
do_link()
fi
}
fi
}
-do_test()
-{
+do_test() {
# TODO: test for free space and free inodes in the $DEST filesystem
block_size=`stat --file-system --format "%S" "$DEST"`
free_blocks=`stat --file-system --format "%f" "$DEST"`
# TODO: test for free space and free inodes in the $DEST filesystem
block_size=`stat --file-system --format "%S" "$DEST"`
free_blocks=`stat --file-system --format "%f" "$DEST"`
@@
-176,7
+176,9
@@
if (( `id -u` != 0 )); then { echo "Sorry, must be root. Exiting..."; exit; } f
echo "$(date): BEGIN backup: $0 $@"
echo "$(date): $0 $SRC $DEST $@"
do_init
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
do_test
do_link
do_backup