X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=bin%2Fbackup-status;h=a871c96c2ef18e3ff7b1c3516fad9cf153b8ebe6;hb=1364bf51df1f87f244b39aa4343ec924da1c8aba;hp=68a7d1f8334feab9b4c6d02fb44fff56eca7edc5;hpb=71f066fced8907d969cddff1d8e83920ce6fd16a;p=backup-script.git

diff --git a/bin/backup-status b/bin/backup-status
index 68a7d1f..a871c96 100755
--- 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
@@ -10,7 +10,7 @@
 # Please read the file COPYING, README and AUTHORS for more information.
 #
 
-NAME=`basename $0`
+NAME=$(basename "$0")
 PIDFILE="/var/run/backup-script.pid"
 QUICK=0
 ONLY_ERRORS=0
@@ -36,6 +36,7 @@ for conf in \
 	"/usr/local/etc/backup-script.conf" \
 ; do
 	if [ -r "$conf" ]; then
+		# shellcheck source=/dev/null
 		source "$conf"
 		break
 	fi
@@ -58,7 +59,8 @@ Check_Size() {
 	# $2: padding
 
 	if [ "$QUICK" = "0" ]; then
-		size=`du -Hhs "$1" | cut -f1`
+		size=$(du -Hhs "$1" | cut -f1)
+		# shellcheck disable=SC2086
 		echo "$2  - Size:" $size
 	fi
 }
@@ -68,21 +70,68 @@ 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"
+		# shellcheck source=/dev/null
+		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"
+		# shellcheck disable=SC2086
+		[ -n "$start" ] && echo "$2  - Start date:" $start
+		# shellcheck disable=SC2086
+		[ -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
@@ -96,12 +145,13 @@ Snapshot_Info() {
 
 Get_Result_Code() {
 	code=1
+	# shellcheck source=/dev/null
 	[ -r "$1" ] && source "$1"
 	[ -z "$code" ] && code=1
 	echo $code
 }
 
-if [ "$1" == "-r" -o "$1" == "--running" ]; then
+if [[ "$1" == "-r" || "$1" == "--running" ]]; then
 	pid="$(cat "$PIDFILE" 2>/dev/null)"
 	if [ -n "$pid" ]; then
 		if kill -0 "$pid" >/dev/null 2>&1; then
@@ -145,16 +195,16 @@ if [ $# -ge 1 ]; then
 			echo "$NAME: Can' read \"${conf_d}/$s\"!"
 			exit 1
 		fi
-		sys="$sys ${conf_d}/$s"
+		sys+=("${conf_d}/$s")
 	done
 else
-	sys="${conf_d}/"*
+	sys=("${conf_d}/"*)
 fi
 
-for f in $sys; do
-	[ -r "$f" -a -f "$f" ] || continue
+for f in "${sys[@]}"; do
+	[[ -r "$f" && -f "$f" ]] || continue
 
-	fname=`basename $f`
+	fname=$(basename "$f")
 	case "$fname" in
 		"backup-script.conf"|*.sh)
 			continue
@@ -167,6 +217,7 @@ for f in $sys; do
 	generations="$default_generations"
 
 	# Read in system configuration file
+	# shellcheck source=/dev/null
 	source "$f"
 
 	target="$target/$(basename "$f")"
@@ -177,7 +228,7 @@ for f in $sys; do
 		[ $generations -gt 0 ] \
 			&& result=$(Get_Result_Code "$target/latest/.stamp") \
 			|| result=$(Get_Result_Code "$target/.stamp")
-		[ $result -eq 0 -o $result -eq 24 ] && continue
+		[[ $result -eq 0 || $result -eq 24 ]] && continue
 	fi
 
 	# System name
@@ -208,12 +259,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-