X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=primary-setup;h=e7d70f2eaaf72c257e05be299feaa7bf3a76802d;hb=06a56540b041accaaff795ad57664e368cb07a10;hp=b8e594cbd93218e522253dbcbef5c8360d2f663f;hpb=9c77c557e60d21caceeef1e78e35b35ed968fca9;p=distro-setup

diff --git a/primary-setup b/primary-setup
index b8e594c..e7d70f2 100755
--- a/primary-setup
+++ b/primary-setup
@@ -7,11 +7,19 @@ source /usr/local/lib/err
 
 script_name="${BASH_SOURCE[0]}"
 script_name="${script_name##*/}"
-pre="${SSH_CLIENT:+$HOSTNAME} $script_name:"
+pre="$script_name:${0##*/}:${SSH_CLIENT:+ $HOSTNAME:}"
 m() { printf "$pre %s\n"  "$*"; "$@"; }
 e() { printf "$pre %s\n"  "$*"; }
 err() { echo "[$(date +'%Y-%m-%d %H:%M:%S%z')]: $0: $*" >&2; }
-
+# service maybe
+serm() {
+  local service
+  service="${*: -1}"
+  if [[ ! -s /etc/systemd/system/$service ]]; then
+    return 0
+  fi
+  m "$@"
+}
 
 [[ $EUID == 0 ]] || exec sudo -E "${BASH_SOURCE[0]}" "$@"
 
@@ -45,7 +53,7 @@ fi
 if [[ $HOSTNAME == "$MAIL_HOST" || $HOSTNAME == kd ]]; then
   m systemctl --now enable btrbk.timer
 else
-  m systemctl --now disable btrbk.timer
+  serm systemctl --now disable btrbk.timer
 fi
 
 
@@ -60,8 +68,8 @@ if dpkg -s rss2email &>/dev/null; then
       rm -f ${files[@]}
     fi
 
-    m systemctl stop rss2email.service
-    m systemctl --now disable rss2email.timer
+    serm systemctl stop rss2email.service
+    serm systemctl --now disable rss2email.timer
     # arbtt disabled for now
     # for ((i=0; i<10; i++)); do
     #   killall arbtt-capture || break