Update copyright notices for 2016

[backup-script.git] / bin / backup-status

diff --git a/bin/backup-status b/bin/backup-status
index 68a7d1f8334feab9b4c6d02fb44fff56eca7edc5..eff19744b0c652519960d643705dafa41342785d 100755 (executable)
--- a/bin/backup-status
+++ b/bin/backup-status
@@ -1,7 +1,7 @@
 #!/bin/bash
 #
 # backup-script system for cloning systems using rsync
-# Copyright (c)2008-2015 Alexander Barton, alex@barton.de
+# Copyright (c)2008-2016 Alexander Barton, alex@barton.de
 #
 # 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
@@ -68,21 +68,65 @@ Check_Stamp() {
        # $2: padding
 
        if [ -f "$1" ]; then
-               if [ "$(uname)" = "Linux" ]; then
-                       last=`LC_ALL=C stat "$1" | grep "^Modify: " \
-                        | cut -d':' -f2- | cut -d. -f1`
+               declare -i code=-1
+               declare -i start_t=-1
+               start=""
+               declare -i end_t=-1
+               end=""
+               declare -i duration_t=-1
+
+               # Read in "stamp file"
+               source "$1"
+
+               if [ $start_t -gt 0 ] && [ $end_t -gt 0 ]; then
+                       if [ "$(uname)" = "Linux" ]; then
+                               start=$(date -d @"$start_t")
+                               end=$(date -d @"$end_t")
+                       else
+                               start=$(date -r "$start_t")
+                               end=$(date -r "$end_t")
+                       fi
+                       duration_t=$end_t-$start_t
                else
-                       last=`LC_ALL=C stat -f "%Sc" "$1"`
+                       if [ "$(uname)" = "Linux" ]; then
+                               end=`LC_ALL=C stat "$1" | grep "^Modify: " \
+                                | cut -d':' -f2- | cut -d. -f1`
+                       else
+                               end=`LC_ALL=C stat -f "%Sc" "$1"`
+                       fi
                fi
-               [ -n "$last" ] && echo "$2  - Date:" $last
-               code=
-               source "$1"
+               [ -n "$start" ] && echo "$2  - Start date:" $start
+               [ -n "$end" ] && echo "$2  - End date:" $end
+               if [ $duration_t -gt -1 ]; then
+                       declare -i s=$duration_t
+                       if [ $s -ge 60 ]; then
+                               declare -i m=$(($s/60))
+                               declare -i s=$(($s%60))
+                               if [ $m -ge 60 ]; then
+                                       declare -i h=$(($m/60))
+                                       declare -i m=$(($m%60))
+                                       if [ $h -ge 24 ]; then
+                                               declare -i d=$(($h/24))
+                                               declare -i h=$(($h%24))
+                                               duration="${d}d${h}h${m}m${s}s"
+                                       else
+                                               duration="${h}h${m}m${s}s"
+                                       fi
+                               else
+                                       duration="${m}m${s}s"
+                               fi
+                       else
+                               duration="${s}s"
+                       fi
+                       echo "$2  - Duration:" $duration
+               fi
+
                case "$code" in
                  0)    txt=", OK"; ;;
                  24)   txt=", WARNING (some files vanished during backup)"; ;;
                  *)    txt=", ERROR"
                esac
-               [ -n "$code" ] && echo "$2  - Result code: $code$txt"
+               [ $code -ge 0 ] && echo "$2  - Result code: ${code}${txt}"
        else
                echo "$2  - No timestamp recorded! Backup currently running or aborted?"
        fi
@@ -208,12 +252,17 @@ for f in $sys; do
        echo
 done
 
+if [ "$ONLY_ERRORS" != "0" ]; then
+       status="failed "; p0="."; pN="!"
+else
+       status=""; p0="!"; pN="."
+fi
 if [ $count -lt 1 ]; then
-       echo "No backups found!"
+       echo "No ${status}backups found${p0}"
        exit 1
 fi
 [ $count -eq 1 ] && sc="" || sc="s"
 [ $snapshots -eq 1 ] && ss="" || ss="s"
-echo "$count system backup$sc found, $snapshots snapshot$ss."
+echo "$count ${status}system backup$sc found, $snapshots snapshot$ss${pN}"
 
 # -eof-