X-Git-Url: https://arthur.barton.de/gitweb/?a=blobdiff_plain;f=bin%2Fbackup-status;h=092931bb8fbf699c70dc30b403dbb1106c57bda2;hb=9cc923e52039af98307a22382d353af260df5eb7;hp=a5ea7c171c56c92a5ac977feb98c98659d973e6b;hpb=395c0f24b3f4f33585be18f9e1cd7409fa201440;p=backup-script.git

diff --git a/bin/backup-status b/bin/backup-status
index a5ea7c1..092931b 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,7 +11,6 @@
 #
 
 NAME=`basename $0`
-CONF_D="/etc/backup-script.d"
 QUICK=0
 
 export LC_ALL=C
@@ -20,15 +19,31 @@ declare -i count=0
 declare -i snapshots=0
 
 # Default settings, can be overwritten in backup-script.conf:
+[ -d "/usr/local/etc/backup-script.d" ] \
+	&& conf_d="/usr/local/etc/backup-script.d" \
+	|| conf_d="/etc/backup-script.d"
 default_target=""
 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
+
 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 +53,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,7 +69,7 @@ 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
 }
 
@@ -62,23 +81,23 @@ fi
 case "$1" in
     "-"*)
 	echo "Usage: $NAME [-q] [<system> [<system> [...]]]"
-	exit 1
+	exit 2
 	;;
 esac
 
 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"
+[ -r "${conf_d}/backup-script.conf" ] && source "${conf_d}/backup-script.conf"
 
 for f in $sys; do
 	[ -r "$f" -a -f "$f" ] || continue
@@ -98,11 +117,7 @@ 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/$system"
 
 	[ -d "$target" ] || continue
 
@@ -113,7 +128,8 @@ for f in $sys; do
 	echo "- Target: $target"
 
 	if [ $generations -gt 0 ]; then
-		for s in $target/[0-9]*-[0-9]*; do
+		for s in $target/current $target/[0-9]*-[0-9]*; do
+			[ -e "$s" ] || continue
 			echo "  - Snapshot: $s"
 			Check_Size "$s" "  "
 			Check_Stamp "$s/.stamp" "  "
@@ -121,7 +137,7 @@ for f in $sys; do
 		done
 	else
 		# Timestamp and result code
-		Check_Size "$s"
+		Check_Size "$target"
 		Check_Stamp "$target/.stamp"
 		snapshots=$snapshots+1
 	fi