projects
/
matthijs
/
upstream
/
backupninja.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
sys: backup dmsetup info as well, for easier restoring of Luks headers
[matthijs/upstream/backupninja.git]
/
src
/
backupninja.in
diff --git
a/src/backupninja.in
b/src/backupninja.in
index 47630f282dc01572830e9b79d0ee5ba2159442b5..2a1b76ebae4c1d512a6a3f800a92a7e9573cc326 100755
(executable)
--- a/
src/backupninja.in
+++ b/
src/backupninja.in
@@
-98,7
+98,7
@@
function printmsg() {
function logmsg() {
if [ -w "$logfile" ]; then
function logmsg() {
if [ -w "$logfile" ]; then
- echo -e `date "+%h %d %H:%M:%S"` "$@" >> $logfile
+ echo -e `
LC_ALL=C
date "+%h %d %H:%M:%S"` "$@" >> $logfile
fi
}
fi
}
@@
-200,14
+200,17
@@
function toint() {
# we grab the current time once, since processing
# all the configs might take more than an hour.
# we grab the current time once, since processing
# all the configs might take more than an hour.
-nowtime=`date +%H`
-nowday=`date +%d`
-nowdayofweek=`date +%A`
+nowtime=`
LC_ALL=C
date +%H`
+nowday=`
LC_ALL=C
date +%d`
+nowdayofweek=`
LC_ALL=C
date +%A`
nowdayofweek=`tolower "$nowdayofweek"`
function isnow() {
local when="$1"
set -- $when
nowdayofweek=`tolower "$nowdayofweek"`
function isnow() {
local when="$1"
set -- $when
+
+ [ "$when" == "manual" ] && return 0
+
whendayofweek=$1; at=$2; whentime=$3;
whenday=`toint "$whendayofweek"`
whendayofweek=`tolower "$whendayofweek"`
whendayofweek=$1; at=$2; whentime=$3;
whenday=`toint "$whendayofweek"`
whendayofweek=`tolower "$whendayofweek"`
@@
-298,9
+301,9
@@
function process_action() {
ret=$?
IFS=$'\t\n'
if [ $ret == 0 ]; then
ret=$?
IFS=$'\t\n'
if [ $ret == 0 ]; then
- debug "skipping $file because
it is not
$w"
+ debug "skipping $file because
current time does not match
$w"
else
else
- info ">>>> starting action $file (because
it i
s $w)"
+ info ">>>> starting action $file (because
current time matche
s $w)"
run="yes"
fi
done
run="yes"
fi
done
@@
-561,7
+564,7
@@
if [ $doit == 1 ]; then
previous=""
for i in $(ls "$configdirectory"); do
backuploc=$(grep ^directory "$configdirectory"/"$i" | @AWK@ '{print $3}')
previous=""
for i in $(ls "$configdirectory"); do
backuploc=$(grep ^directory "$configdirectory"/"$i" | @AWK@ '{print $3}')
- if [ "$backuploc" != "$previous" ]; then
+ if [ "$backuploc" != "$previous"
-a -n "$backuploc"
]; then
df -h "$backuploc"
previous="$backuploc"
fi
df -h "$backuploc"
previous="$backuploc"
fi