X-Git-Url: https://arthur.barton.de/gitweb/?a=blobdiff_plain;f=bin%2Fbackup-status;h=c1a09b598132bc0f54d62c7ec59df5bfe0e1e4d4;hb=f694c45e43480d4c998af6cb4753142f5416c6dc;hp=26cd0cff6c1551b6ad08910f424589b9a892b3cd;hpb=0727c80bea1a549c8d028dd0bff687ffc3c9a6a2;p=backup-script.git

diff --git a/bin/backup-status b/bin/backup-status
index 26cd0cf..c1a09b5 100755
--- a/bin/backup-status
+++ b/bin/backup-status
@@ -11,7 +11,9 @@
 #
 
 NAME=`basename $0`
+PIDFILE="/var/run/backup-script.pid"
 QUICK=0
+ONLY_LATEST=0
 
 export LC_ALL=C
 
@@ -38,6 +40,12 @@ for conf in \
 	fi
 done
 
+Usage() {
+	echo "Usage: $NAME [-q|--quick] [<system> [<system> [...]]]"
+	echo "       $NAME {-r|--running}"
+	exit 2
+}
+
 Check_Size() {
 	# $1: directory
 	# $2: padding
@@ -53,14 +61,14 @@ Check_Stamp() {
 	# $2: padding
 
 	if [ -f "$1" ]; then
-		if [ `uname` = "Linux" ]; then
+		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"; ;;
@@ -73,20 +81,48 @@ Check_Stamp() {
 	fi
 }
 
-if [ "$1" == "-q" ]; then
-	QUICK=1
-	shift
+Snapshot_Info() {
+	echo "  - Snapshot: $1"
+	Check_Size "$1" "  "
+	Check_Stamp "$1/.stamp" "  "
+}
+
+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
 fi
 
-case "$1" in
-    "-"*)
-	echo "Usage: $NAME [-q] [<system> [<system> [...]]]"
-	exit 2
-	;;
-esac
+while [ $# -gt 0 ]; do
+	case "$1" in
+		"--latest"|"-l")
+			ONLY_LATEST=1
+			;;
+		"--quick"|"-q")
+			QUICK=1
+			;;
+		"-"*)
+			Usage
+			;;
+		*)
+			break
+	esac
+	shift
+done
 
 if [ $# -ge 1 ]; then
-	for s in $@; do
+	for s in "$@"; do
 		if [ ! -r "${conf_d}/$s" ]; then
 			echo "$NAME: Can' read \"${conf_d}/$s\"!"
 			exit 1
@@ -94,7 +130,7 @@ if [ $# -ge 1 ]; then
 		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"
@@ -117,10 +153,6 @@ 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/$system"
 
 	[ -d "$target" ] || continue
@@ -132,13 +164,16 @@ for f in $sys; do
 	echo "- Target: $target"
 
 	if [ $generations -gt 0 ]; then
-		for s in $target/current $target/[0-9]*-[0-9]*; do
-			[ -e "$s" ] || continue
-			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 "$target"