Add "[default_]exclude_dirs_add" options

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

diff --git a/bin/backup-status b/bin/backup-status
index cf7efc97ad9251a85020161ac9c49413ff45db37..7c1c1830a66a6bf5a3eee26f84ae001827d9be4f 100755 (executable)
--- 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
 
@@ -22,7 +24,7 @@ declare -i snapshots=0
 [ -d "/usr/local/etc/backup-script.d" ] \
        && conf_d="/usr/local/etc/backup-script.d" \
        || conf_d="/etc/backup-script.d"
-default_target=""
+default_target="/var/backups"
 default_generations=0
 
 # Search configuration file (last one is used as default!)
@@ -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
@@ -73,17 +81,45 @@ 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
@@ -97,8 +133,6 @@ else
        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
 
@@ -117,11 +151,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/$system"
+       target="$target/$(basename "$f")"
 
        [ -d "$target" ] || continue
 
@@ -132,13 +162,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"