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

diff --git a/bin/backup-status b/bin/backup-status
index a5ea7c1..68a7d1f 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-2013 Alexander Barton, alex@barton.de
+# Copyright (c)2008-2015 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
@@ -11,8 +11,10 @@
 #
 
 NAME=`basename $0`
-CONF_D="/etc/backup-script.d"
+PIDFILE="/var/run/backup-script.pid"
 QUICK=0
+ONLY_ERRORS=0
+ONLY_LATEST=0
 
 export LC_ALL=C
 
@@ -20,15 +22,43 @@ declare -i count=0
 declare -i snapshots=0
 
 # Default settings, can be overwritten in backup-script.conf:
-default_target=""
+[ -d "/usr/local/etc/backup-script.d" ] \
+	&& conf_d="/usr/local/etc/backup-script.d" \
+	|| conf_d="/etc/backup-script.d"
+default_target="/var/backups"
 default_generations=0
 
+# Search configuration file (last one is used as default!)
+for conf in \
+	"/usr/local/etc/backup-script.conf" \
+	"/etc/backup-script.conf" \
+	"${conf_d}/backup-script.conf" \
+	"/usr/local/etc/backup-script.conf" \
+; do
+	if [ -r "$conf" ]; then
+		source "$conf"
+		break
+	fi
+done
+
+Usage() {
+	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
+}
+
 Check_Size() {
 	# $1: directory
 	# $2: padding
 
 	if [ "$QUICK" = "0" ]; then
-		size=`du -sh "$1" | cut -f1`
+		size=`du -Hhs "$1" | cut -f1`
 		echo "$2  - Size:" $size
 	fi
 }
@@ -38,10 +68,14 @@ Check_Stamp() {
 	# $2: padding
 
 	if [ -f "$1" ]; then
-		last=`stat "$1" | grep "^Modify: " \
-		  | cut -d':' -f2- | cut -d. -f1`
+		if [ "$(uname)" = "Linux" ]; then
+			last=`LC_ALL=C stat "$1" | grep "^Modify: " \
+			 | cut -d':' -f2- | cut -d. -f1`
+		else
+			last=`LC_ALL=C stat -f "%Sc" "$1"`
+		fi
 		[ -n "$last" ] && echo "$2  - Date:" $last
-		unset code
+		code=
 		source "$1"
 		case "$code" in
 		  0)	txt=", OK"; ;;
@@ -50,36 +84,73 @@ Check_Stamp() {
 		esac
 		[ -n "$code" ] && echo "$2  - Result code: $code$txt"
 	else
-		echo "$2  - No timestamp recorded!? Backup aborted?"
+		echo "$2  - No timestamp recorded! Backup currently running or aborted?"
 	fi
 }
 
-if [ "$1" == "-q" ]; then
-	QUICK=1
-	shift
-fi
+Snapshot_Info() {
+	echo "  - Snapshot: $1"
+	Check_Size "$1" "  "
+	Check_Stamp "$1/.stamp" "  "
+}
 
-case "$1" in
-    "-"*)
-	echo "Usage: $NAME [-q] [<system> [<system> [...]]]"
+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
+		if kill -0 "$pid" >/dev/null 2>&1; then
+			echo "Backup job running with PID $pid."
+			echo
+			pstree -ap "$pid" 2>/dev/null
+			exit 0
+		else
+			echo "No backup running (invalid PID $pid in \"$PIDFILE\")."
+			exit 1
+		fi
+	fi
+	echo "No backup running (no PID file \"$PIDFILE\" found)."
 	exit 1
-	;;
-esac
+fi
+
+while [ $# -gt 0 ]; do
+	case "$1" in
+		"--errors"|"-e")
+			ONLY_ERRORS=1
+			ONLY_LATEST=1
+			;;
+		"--latest"|"-l")
+			ONLY_LATEST=1
+			;;
+		"--quick"|"-q")
+			QUICK=1
+			;;
+		"-"*)
+			Usage
+			;;
+		*)
+			break
+	esac
+	shift
+done
 
 if [ $# -ge 1 ]; then
-	for s in $@; do
-		if [ ! -r "${CONF_D}/$s" ]; then
-			echo "$NAME: Can' read \"${CONF_D}/$s\"!"
+	for s in "$@"; do
+		if [ ! -r "${conf_d}/$s" ]; then
+			echo "$NAME: Can' read \"${conf_d}/$s\"!"
 			exit 1
 		fi
-		sys="$sys ${CONF_D}/$s"
+		sys="$sys ${conf_d}/$s"
 	done
 else
-	sys=${CONF_D}/*
+	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
 
@@ -98,14 +169,17 @@ for f in $sys; do
 	# Read in system configuration file
 	source "$f"
 
-	# Validate configuration
-	[ "$system" = "localhost" -o "$system" = "127.0.0.1" ] && local=1
-
-	destdir="$target"
-	target="$target/$fname"
+	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]"
 
@@ -113,15 +187,19 @@ for f in $sys; do
 	echo "- Target: $target"
 
 	if [ $generations -gt 0 ]; then
-		for s in $target/[0-9]*-[0-9]*; do
-			echo "  - Snapshot: $s"
-			Check_Size "$s" "  "
-			Check_Stamp "$s/.stamp" "  "
+		if [ "$ONLY_LATEST" = "0" ]; then
+			for s in $target/[0-9]*-[0-9]* $target/current; do
+				[ -e "$s" ] || continue
+				Snapshot_Info "$s"
+				snapshots=$snapshots+1
+			done
+		elif [ -e "$target/latest" ]; then
+			Snapshot_Info "$target/latest"
 			snapshots=$snapshots+1
-		done
+		fi
 	else
 		# Timestamp and result code
-		Check_Size "$s"
+		Check_Size "$target"
 		Check_Stamp "$target/.stamp"
 		snapshots=$snapshots+1
 	fi