Autodetect "localhost" and 127.0.0.1 as being "local"

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

diff --git a/bin/backup-script b/bin/backup-script
index 00c4be64d41e18a2cd0f0e158b5319a12416acfb..89abead0610b6c11cfd63c5effe25cf1d7a649d0 100755 (executable)
--- a/bin/backup-script
+++ b/bin/backup-script
@@ -139,14 +139,15 @@ fi
 for f in $sys; do
        [ -r "$f" -a -f "$f" ] || continue
 
-       system=`basename $f`
-       case "$system" in
+       fname=`basename $f`
+       case "$fname" in
                "backup-script.conf"|*.sh)
                        continue
                        ;;
        esac
 
        # Set global defaults
+       system="$fname"
        user="$default_user"
        target="$default_target"
        ssh_args_add="$default_ssh_args_add"
@@ -159,9 +160,15 @@ for f in $sys; do
        # Read in system configuration file
        source "$f"
 
+       # Validate configuration
+       [ "$system" = "localhost" -o "$system" = "127.0.0.1" ] && local=1
+
+       [ "$system" = "$fname" ] \
+               && systxt="\"$system\"" \
+               || systxt="\"$fname\" [\"$system\"]"
        [ "$local" -eq 0 ] \
-               && echo "Working on \"$system\" ..." \
-               || echo "Working on \"$system\" (local system) ..."
+               && echo "Working on $systxt ..." \
+               || echo "Working on $sytxts (local system) ..."
 
        count_all=$count_all+1
 
@@ -216,9 +223,9 @@ for f in $sys; do
        echo -n "Start date: "; date
        echo "$cmd"
        count_started=$count_started+1
-       rm -f "$sys_target/.stamp"
        
        if [ "$DRYRUN" -eq 0 ]; then
+               rm -f "$sys_target/.stamp"
                $SHELL -c "$cmd"; ret=$?
                echo "code=$ret" >"$sys_target/.stamp"
        else