X-Git-Url: https://git.stderr.nl/gitweb?p=matthijs%2Fupstream%2Fbackupninja.git;a=blobdiff_plain;f=backupninja;h=3943724d3449c0ef12b02eaaf9fd7553c2522ac1;hp=ce85ba46d10ca25d3a95e2aca50ab467f8512d95;hb=c7e96acc455c3b5c74f97e812072e1a55664adce;hpb=c8ad6fc41533def8ecca1fcf5c9a6bff3e382fa0 diff --git a/backupninja b/backupninja index ce85ba4..3943724 100755 --- a/backupninja +++ b/backupninja @@ -143,7 +143,6 @@ function getconf() { # replace * with %, so that it is not globbed. ret="${ret//\\*/__star__}" - ret="${ret//\*/__star__}" # this is weird, but single quotes are needed to # allow for returned values with spaces. $ret is still expanded @@ -268,6 +267,8 @@ function process_action() { getconf when "$defaultwhen" if [ "$processnow" == 1 ]; then info "running $file because of --now" + elif [ "$when" == "hourly" ]; then + debug "running $file because 'when = hourly'" else IFS=$'\t\n' for w in $when; do @@ -318,10 +319,12 @@ function process_action() { elif [ $_warnings != 0 ]; then msg "*warning* -- $file" errormsg="$errormsg\n== warnings from $file ==\n\n$ret\n" - elif [ $retcode == 0 ]; then - msg "success -- $file" else - msg "unknown -- $file" + msg "success -- $file" +# elif [ $retcode == 0 ]; then +# msg "success -- $file" +# else +# msg "unknown -- $file" fi let "fatals += _fatals" @@ -407,6 +410,7 @@ getconf GZIP /bin/gzip getconf RSYNC /usr/bin/rsync [ -d "$configdirectory" ] || fatal "Configuration directory '$configdirectory' not found." +[ -f "$logfile" ] || touch $logfile if [ "$UID" != "0" ]; then echo "$0 can only be run as root" @@ -428,7 +432,7 @@ errormsg="" if [ "$singlerun" ]; then files=$singlerun else - files=`find $configdirectory -mindepth 1 ` + files=`find $configdirectory -mindepth 1 | sort -n` fi for file in $files; do