X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=btrbk-run;h=f3589700b35729fa4cbb691e265a83e64c11658a;hb=5f97e1c4a592a6384a7a3d86f8ed337beb7e108f;hp=31649a495cf7373fe9af900233c4fc0994813596;hpb=e256742f75e1127266e4ce1e2a871a81a72bc84a;p=distro-setup

diff --git a/btrbk-run b/btrbk-run
index 31649a4..f358970 100644
--- a/btrbk-run
+++ b/btrbk-run
@@ -126,7 +126,7 @@ fi
 # set default targets
 if [[ ! -v targets && ! $source ]]; then
   if [[ $HOSTNAME != "$MAIL_HOST" ]] && $cron ; then
-    echo "We are not MAIL_HOST, nothing to do"
+    echo "MAIL_HOST=$MAIL_HOST, nothing to do"
     exit 0
   fi
   case $HOSTNAME in
@@ -216,7 +216,7 @@ for m in "${mountpoints[@]}"; do
     break
   fi
 done
-if ! $pull_reexec && [[ $source ]] && ! $pulla ; then
+if ! $pull_reexec && [[ $source ]] && $pulla ; then
   tmpf=$(mktemp)
   scp $source:/a/bin/distro-setup/btrbk-run $tmpf
   if ! diff -q $tmpf $BASH_SOURCE; then
@@ -244,7 +244,7 @@ mkdir -p /mnt/root/btrbk
 local_zone=$(date +%z)
 
 if [[ $source ]]; then
-  if ! zone=$(ssh root$source date +%z); then
+  if ! zone=$(ssh root@$source date +%z); then
     die failed to ssh to root@$source
   fi
   if [[ $zone != $local_zone ]]; then
@@ -255,15 +255,23 @@ else
 
   sshable=()
   sshfail=()
+  min_idle_ms=$((1000 * 60 * 15))
   for h in ${targets[@]}; do
     if zone=$(ssh root@$h "mkdir -p /mnt/root/btrbk && date +%z"); then
+      if $cron && DISPLAY=:0 xprintidle; then
+        # This is a separate ssh because xprintidle can fail and thats ok.
+        # Ignore this host. i sometimes use a non-main machine for testing or web browsing, knowing that
+        # everything will be wiped by the next backup, but I dont want it to happen as Im using
+        # it from cronjob.
+        continue
+      fi
       sshable+=($h)
+      if [[ $zone != $local_zone ]]; then
+        die "error: dont confuse yourself with multiple time zones. $h has different timezone than localhost"
+      fi
     else
       sshfail+=($h)
     fi
-    if [[ $zone != $local_zone ]]; then
-      die "error: dont confuse yourself with multiple time zones. $h has different timezone than localhost"
-    fi
   done
   if [[ ! $sshable ]] || { ! $cron && [[ $sshfail ]]; }; then
     die "failed to ssh to hosts: ${sshfail[*]}"