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

diff --git a/bin/backup-status b/bin/backup-status
index c1a09b5..68a7d1f 100755
--- a/bin/backup-status
+++ b/bin/backup-status
@@ -13,6 +13,7 @@
 NAME=`basename $0`
 PIDFILE="/var/run/backup-script.pid"
 QUICK=0
+ONLY_ERRORS=0
 ONLY_LATEST=0
 
 export LC_ALL=C
@@ -24,7 +25,7 @@ declare -i snapshots=0
 [ -d "/usr/local/etc/backup-script.d" ] \
 	&& conf_d="/usr/local/etc/backup-script.d" \
 	|| conf_d="/etc/backup-script.d"
-default_target=""
+default_target="/var/backups"
 default_generations=0
 
 # Search configuration file (last one is used as default!)
@@ -41,8 +42,14 @@ for conf in \
 done
 
 Usage() {
-	echo "Usage: $NAME [-q|--quick] [<system> [<system> [...]]]"
-	echo "       $NAME {-r|--running}"
+	echo "Usage: $NAME [--errors|--latest] [--quick] [<system> [<system> [...]]]"
+	echo "       $NAME --running"
+	echo
+	echo "  --errors, -e    Only show current backups with errors (implies \"--latest\")."
+	echo "  --latest, -l    Only show latest backup generations."
+	echo "  --quick, -q     Don't calculate backup sizes."
+	echo "  --running, -r   Check if an \"backup-script\" task is currently running."
+	echo
 	exit 2
 }
 
@@ -87,6 +94,13 @@ Snapshot_Info() {
 	Check_Stamp "$1/.stamp" "  "
 }
 
+Get_Result_Code() {
+	code=1
+	[ -r "$1" ] && source "$1"
+	[ -z "$code" ] && code=1
+	echo $code
+}
+
 if [ "$1" == "-r" -o "$1" == "--running" ]; then
 	pid="$(cat "$PIDFILE" 2>/dev/null)"
 	if [ -n "$pid" ]; then
@@ -106,6 +120,10 @@ fi
 
 while [ $# -gt 0 ]; do
 	case "$1" in
+		"--errors"|"-e")
+			ONLY_ERRORS=1
+			ONLY_LATEST=1
+			;;
 		"--latest"|"-l")
 			ONLY_LATEST=1
 			;;
@@ -133,8 +151,6 @@ else
 	sys="${conf_d}/"*
 fi
 
-[ -r "${conf_d}/backup-script.conf" ] && source "${conf_d}/backup-script.conf"
-
 for f in $sys; do
 	[ -r "$f" -a -f "$f" ] || continue
 
@@ -153,10 +169,17 @@ for f in $sys; do
 	# Read in system configuration file
 	source "$f"
 
-	target="$target/$system"
+	target="$target/$(basename "$f")"
 
 	[ -d "$target" ] || continue
 
+	if [ "$ONLY_ERRORS" != "0" ]; then
+		[ $generations -gt 0 ] \
+			&& result=$(Get_Result_Code "$target/latest/.stamp") \
+			|| result=$(Get_Result_Code "$target/.stamp")
+		[ $result -eq 0 -o $result -eq 24 ] && continue
+	fi
+
 	# System name
 	[ "$system" = "$fname" ] && echo "$fname" || echo "$fname [$system]"