various improvements mostly email

[distro-setup] / btrbk-run

diff --git a/btrbk-run b/btrbk-run
index a5fd62a45c54bbbd592d570654c2ceca13fa3c9c..f3589700b35729fa4cbb691e265a83e64c11658a 100644 (file)
--- 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
@@ -255,10 +255,10 @@ else
 
   sshable=()
   sshfail=()
-  min_idle=$((60 * 15))
+  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 && xidle=$(ssh iank@$h DISPLAY=:0 xprintidle) && [[ $xidle && $xidle -lt $min_idle ]]; 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