X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=switch-mail-host;h=3f299bab601488f44c7d4a7f64ce2601c04ed76c;hb=523b7ff889aaafdcd997d84b2a06744993018e89;hp=21d988251f31dd7e88a2cc5ee13fee808faacbf2;hpb=ae96136375d4c36c4b6845bbf1975695ccc4b844;p=distro-setup

diff --git a/switch-mail-host b/switch-mail-host
index 21d9882..3f299ba 100644
--- a/switch-mail-host
+++ b/switch-mail-host
@@ -167,7 +167,7 @@ case $direction in
         e "found different version on old_host=$old_hostname, reexecing"
         m install -T $tmpf /usr/local/bin/switch-mail-host
         m /usr/local/bin/switch-mail-host --pull-reexec "${orig_args[@]}"
-        mexit 0
+        exit 0
       fi
     fi
 
@@ -281,7 +281,9 @@ EOF
   fi
 } | $new_shell bash -s
 
-$old_shell bash -s <<'EOF'
+if ! $mail_only; then
+  $old_shell bash -s <<'EOF'
+set -e
 if pgrep -G iank -u iank -f 'emacs --daemon' &>/dev/null; then
   bufs="$(sudo -u iank env XDG_RUNTIME_DIR=/run/user/1000 emacsclient --eval "$(cat /a/bin/ds/unsaved-buffers.el)"| sed '/^"nil"$/d;s/^"(/E: /;s/)"$//')"
   if [[ $bufs ]]; then
@@ -289,7 +291,16 @@ if pgrep -G iank -u iank -f 'emacs --daemon' &>/dev/null; then
     exit 1
   fi
 fi
+
+# Try to prevent emacs from saving stale data it has in memory to disk. eg: files, recentf list, etc.
+# But if emacs ignores the signal, let it live.
+pkill -xf 'emacs( --daemon| -f znc-all)' ||:
+
+if [[ -e /p/profanity-here ]]; then
+  systemctl disable --now profanity
+fi
 EOF
+fi
 
 # previously, I was checking to see if the new mail host
 # is on my home network, then changing my home dns
@@ -323,6 +334,9 @@ if $host2_only; then
     m $old_shell systemctl --now disable btrbk.timer
   fi
   m $new_shell systemctl --now enable btrbk.timer
+  if [[ -e /p/profanity-here ]]; then
+    m $new_shell systemctl --now enable profanity
+  fi
   exit 0
 fi
 
@@ -332,9 +346,6 @@ if (( ret )); then
   exit $ret
 fi
 
-# Try to prevent emacs from saving stale data it has in memory to disk. eg: files, recentf list, etc.
-# But if emacs ignores the signal, let it live.
-m $new_shell killall -q emacs ||:
 
 e Running main btrbk
 m btrbk-run -v --fast $bbk_args $force_arg $incremental_arg -m /o || ret=$?
@@ -363,4 +374,12 @@ if (( ret )); then
   exit $ret
 fi
 
+if ! $mail_only && [[ -e /p/profanity-here ]]; then
+  m $new_shell systemctl --now enable profanity || ret=$?
+  if (( ret )); then
+    err "failed final systemctl --now enable profanity, just fix and rerun"
+    exit $ret
+  fi
+fi
+
 m exit 0