backup-status: Handle "conf_d" variable in backup-script.conf

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

diff --git a/bin/backup-status b/bin/backup-status
index 26efc142a53bd03e2cd138f821a01031e7222c00..72869ba67baaab593b329ede9ecb22741c4cbc1e 100755 (executable)
--- 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-2014 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,9 +19,16 @@ declare -i count=0
 declare -i snapshots=0
 
 # Default settings, can be overwritten in backup-script.conf:
+conf_d="/etc/backup-script.d"
 default_target=""
 default_generations=0
 
+for conf in "/etc/backup-script.conf" "${conf_d}/backup-script.conf"; do
+       if [ -r "$conf" ]; then
+               source "$conf"
+       fi
+done
+
 Check_Size() {
        # $1: directory
        # $2: padding
@@ -45,12 +51,12 @@ Check_Stamp() {
                source "$1"
                case "$code" in
                  0)    txt=", OK"; ;;
-                 24)   txt=", files changed during backup"; ;;
-                 *)    txt=""
+                 24)   txt=", WARNING (some files vanished during backup)"; ;;
+                 *)    txt=", ERROR"
                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
 }
 
@@ -61,24 +67,24 @@ fi
 
 case "$1" in
     "-"*)
-       echo "Usage: $NAME [-p] [<system> [<system> [...]]]"
+       echo "Usage: $NAME [-q] [<system> [<system> [...]]]"
        exit 1
        ;;
 esac
 
 if [ $# -ge 1 ]; then
        for s in $@; do
-               if [ ! -r "${CONF_D}/$s" ]; then
-                       echo "$NAME: Can' read \"${CONF_D}/$s\"!"
+               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