lots of fixes, new music stuff

[distro-setup] / primary-setup

diff --git a/primary-setup b/primary-setup
index 01ddd536f7ea7f424fbfbbe2839d3f91f710f30b..b8e594cbd93218e522253dbcbef5c8360d2f663f 100755 (executable)
--- a/primary-setup
+++ b/primary-setup
@@ -5,7 +5,9 @@
 
 source /usr/local/lib/err
 
-pre="${0##*/}:"
+script_name="${BASH_SOURCE[0]}"
+script_name="${script_name##*/}"
+pre="${SSH_CLIENT:+$HOSTNAME} $script_name:"
 m() { printf "$pre %s\n"  "$*"; "$@"; }
 e() { printf "$pre %s\n"  "$*"; }
 err() { echo "[$(date +'%Y-%m-%d %H:%M:%S%z')]: $0: $*" >&2; }
@@ -40,15 +42,23 @@ if [[ -e /dev/shm/iank-status ]]; then
 fi
 
 
+if [[ $HOSTNAME == "$MAIL_HOST" || $HOSTNAME == kd ]]; then
+  m systemctl --now enable btrbk.timer
+else
+  m systemctl --now disable btrbk.timer
+fi
+
+
 if dpkg -s rss2email &>/dev/null; then
   if [[ $HOSTNAME == "$MAIL_HOST" ]]; then
     # arbtt disabled for now
     #DISPLAY=:0 arbtt-capture --sample-rate=10 &
     m systemctl --now enable rss2email.timer
-    # off is in mail-setup. no reason for this to be in the rss2email block.
-    m systemctl --now enable btrbk.timer
   else
-    m systemctl --now disable btrbk.timer
+    files=(/sysd-mail-once/btrbk*)
+    if (( ${#files[@]} )); then
+      rm -f ${files[@]}
+    fi
 
     m systemctl stop rss2email.service
     m systemctl --now disable rss2email.timer