X-Git-Url: https://git.stderr.nl/gitweb?p=matthijs%2Fupstream%2Fbackupninja.git;a=blobdiff_plain;f=src%2Fbackupninja.in;h=34021b56ec4350e811e73762e127bc5fa9fc2a98;hp=ca5074c959ef93e7f375600a36bb9618ff30b657;hb=172b0e3341cb60ffed14eea306373d696dacc600;hpb=4ecaae94054c4eb919ddbd45904d834383a09558

diff --git a/src/backupninja.in b/src/backupninja.in
index ca5074c..34021b5 100755
--- a/src/backupninja.in
+++ b/src/backupninja.in
@@ -1,5 +1,6 @@
 #!@BASH@
 # -*- mode: sh; sh-basic-offset: 3; indent-tabs-mode: nil; -*-
+# vim: set filetype=sh sw=3 sts=3 expandtab autoindent:
 #
 #                          |\_
 # B A C K U P N I N J A   /()/
@@ -142,14 +143,14 @@ function check_perms() {
    local perms
    local owners
 
-   perms=($(stat -L --format='%A' $file))
+   perms=($(@STAT@ -L --format='%A' $file))
    debug "perms: $perms"
    local gperm=${perms:4:3}
    debug "gperm: $gperm"
    local wperm=${perms:7:3}
    debug "wperm: $wperm"
 
-   owners=($(stat -L --format='%g %G %u %U' $file))
+   owners=($(@STAT@ -L --format='%g %G %u %U' $file))
    local gid=${owners[0]}
    local group=${owners[1]}
    local owner=${owners[2]}
@@ -334,8 +335,9 @@ function process_action() {
    _errors=`cat $bufferfile | grep "^Error: " | wc -l`
    _fatals=`cat $bufferfile | grep "^Fatal: " | wc -l`
    _halts=`cat $bufferfile | grep "^Halt: " | wc -l`
+   _infos=`cat $bufferfile | grep "^Info: " | wc -l`
 
-   ret=`grep "\(^Warning: \|^Error: \|^Fatal: \|Halt: \)" $bufferfile`
+   ret=`grep "\(^Info: \|^Warning: \|^Error: \|^Fatal: \|Halt: \)" $bufferfile`
    rm $bufferfile
    if [ $_halts != 0 ]; then
       msg "*halt* -- $file"
@@ -355,6 +357,9 @@ function process_action() {
       warning "<<<< finished action $file: WARNING"
    else
       msg "success -- $file"
+      if [ $_infos != 0 -a "$reportinfo" == "yes" ]; then
+         errormsg="$errormsg\n== infos from $file ==\n\n$ret\n"
+      fi
       info "<<<< finished action $file: SUCCESS"
    fi
 
@@ -455,6 +460,7 @@ getconf reportemail
 getconf reporthost
 getconf reportspace
 getconf reportsuccess yes
+getconf reportinfo no
 getconf reportuser
 getconf reportwarning yes
 getconf loglevel 3
@@ -563,11 +569,11 @@ if [ $doit == 1 ]; then
       if [ "$reportspace" == "yes" ]; then
          previous=""
          for i in $(ls "$configdirectory"); do
-         backuploc=$(grep ^directory "$configdirectory"/"$i" | @AWK@ '{print $3}')
-         if [ "$backuploc" != "$previous" -a -n "$backuploc" ]; then
-            df -h "$backuploc"
-            previous="$backuploc"
-         fi
+            backuploc=$(grep ^directory "$configdirectory"/"$i" | @AWK@ '{print $3}')
+            if [ "$backuploc" != "$previous" -a -n "$backuploc" ]; then
+               df -h "$backuploc"
+               previous="$backuploc"
+            fi
          done
       fi
    } | mail -s "backupninja: $hostname $subject" $reportemail