backup-status: Correctly show "current" snapshot as newest

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

diff --git a/bin/backup-status b/bin/backup-status
index e446b6682753467f179218f5bf53ad95783870c8..4ba22f3a894abe6996f1c30a424508b045df60b4 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-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,7 @@
 #
 
 NAME=`basename $0`
-CONF_D="/etc/backup-script.d"
+PIDFILE="/var/run/backup-script.pid"
 QUICK=0
 
 export LC_ALL=C
@@ -20,15 +20,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 +54,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,10 +70,27 @@ 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
 }
 
+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
+
 if [ "$1" == "-q" ]; then
        QUICK=1
        shift
@@ -61,24 +98,25 @@ fi
 
 case "$1" in
     "-"*)
-       echo "Usage: $NAME [-p] [<system> [<system> [...]]]"
-       exit 1
+       echo "Usage: $NAME [-q] [<system> [<system> [...]]]"
+       echo "       $NAME {-r|--running}"
+       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 +136,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 +147,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/[0-9]*-[0-9]* $target/current; do
+                       [ -e "$s" ] || continue
                        echo "  - Snapshot: $s"
                        Check_Size "$s" "  "
                        Check_Stamp "$s/.stamp" "  "
@@ -121,7 +156,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