backup-status: Correctly quote and initialize variables

[backup-script.git] / bin / backup-status

diff --git a/bin/backup-status b/bin/backup-status
index 32ef7c471f2660f2a71c461e8e497bbad7875dba..cf7efc97ad9251a85020161ac9c49413ff45db37 100755 (executable)
--- a/bin/backup-status
+++ b/bin/backup-status
@@ -19,13 +19,22 @@ declare -i count=0
 declare -i snapshots=0
 
 # Default settings, can be overwritten in backup-script.conf:
-conf_d="/etc/backup-script.d"
+[ -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
 
-for conf in "/etc/backup-script.conf" "${conf_d}/backup-script.conf"; do
+# 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
 
@@ -34,7 +43,7 @@ Check_Size() {
        # $2: padding
 
        if [ "$QUICK" = "0" ]; then
-               size=`du -sh "$1" | cut -f1`
+               size=`du -Hhs "$1" | cut -f1`
                echo "$2  - Size:" $size
        fi
 }
@@ -44,14 +53,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"; ;;
@@ -72,12 +81,12 @@ fi
 case "$1" in
     "-"*)
        echo "Usage: $NAME [-q] [<system> [<system> [...]]]"
-       exit 1
+       exit 2
        ;;
 esac
 
 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
@@ -85,7 +94,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"
@@ -112,7 +121,7 @@ for f in $sys; do
        [ "$system" = "localhost" -o "$system" = "127.0.0.1" ] && local=1
 
        destdir="$target"
-       target="$target/$fname"
+       target="$target/$system"
 
        [ -d "$target" ] || continue
 
@@ -123,7 +132,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" "  "